Commit ad43dc40 authored by Matthew Cary's avatar Matthew Cary Committed by Commit Bot

Android build: dexlayout build fixes.

  * Unnecessary debug art libraries are removed from
    dependancies.
  * Command-line flag dash vs underscore usage diverged from
    what the python script uses.

Bug: 875276
Change-Id: Icb308a4ce62bdac4d6341952f6f088ad7aa201da
Reviewed-on: https://chromium-review.googlesource.com/c/1261555Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596658}
parent 1936977a
......@@ -48,17 +48,10 @@ _default_proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
_dexlayout_path = "//third_party/android_build_tools/art/dexlayout"
_profman_path = "//third_party/android_build_tools/art/profman"
_art_lib_file_names = [
"libartbased.so",
"libartbase.so",
"libart-compiler.so",
"libartd-compiler.so",
"libartd-dexlayout.so",
"libartd-disassembler.so",
"libart-dexlayout.so",
"libart-disassembler.so",
"libartd-simulator-container.so",
"libartd-simulator.so",
"libartd.so",
"libart-gtest.so",
"libart.so",
"libbacktrace.so",
......@@ -66,7 +59,6 @@ _art_lib_file_names = [
"libcrypto-host.so",
"libc++.so",
"libcutils.so",
"libdexfiled.so",
"libdexfile.so",
"libexpat-host.so",
"libicui18n-host.so",
......@@ -79,13 +71,9 @@ _art_lib_file_names = [
"libnativebridge.so",
"libnativehelper.so",
"libnativeloader.so",
"libopenjdkd.so",
"libopenjdkjvmd.so",
"libopenjdkjvm.so",
"libopenjdkjvmtid.so",
"libopenjdkjvmti.so",
"libopenjdk.so",
"libprofiled.so",
"libprofile.so",
"libsigchain.so",
"libssl-host.so",
......@@ -1179,11 +1167,11 @@ if (enable_java_templates) {
if (defined(invoker.dexlayout_profile)) {
args += [
"--dexlayout_profile",
"--dexlayout-profile",
rebase_path(invoker.dexlayout_profile, root_build_dir),
"--dexlayout_path",
"--dexlayout-path",
rebase_path(_dexlayout_path, root_build_dir),
"--profman_path",
"--profman-path",
rebase_path(_profman_path, root_build_dir),
]
inputs += [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment