diff options
| -rw-r--r-- | benchmark/Android.bp | 2 | ||||
| -rw-r--r-- | dexoptanalyzer/Android.bp | 2 | ||||
| -rw-r--r-- | disassembler/Android.bp | 2 | ||||
| -rw-r--r-- | imgdiag/Android.bp | 2 | ||||
| -rw-r--r-- | patchoat/Android.bp | 2 | ||||
| -rw-r--r-- | profman/Android.bp | 2 | ||||
| -rw-r--r-- | test/Android.bp | 22 |
7 files changed, 17 insertions, 17 deletions
diff --git a/benchmark/Android.bp b/benchmark/Android.bp index e784508e14..d0dfec91ff 100644 --- a/benchmark/Android.bp +++ b/benchmark/Android.bp @@ -49,7 +49,7 @@ art_cc_library { name: "libartbenchmark-micronative-host", host_supported: true, device_supported: false, - defaults: ["art_defaults", "art_debug_defaults"], + defaults: ["art_debug_defaults", "art_defaults" ], srcs: [ "jni_loader.cc", "micro-native/micro_native.cc", diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp index cf4c99ec6d..da6663dd6b 100644 --- a/dexoptanalyzer/Android.bp +++ b/dexoptanalyzer/Android.bp @@ -48,8 +48,8 @@ art_cc_binary { art_cc_binary { name: "dexoptanalyzerd", defaults: [ - "dexoptanalyzer-defaults", "art_debug_defaults", + "dexoptanalyzer-defaults", ], shared_libs: [ "libartd", diff --git a/disassembler/Android.bp b/disassembler/Android.bp index 8dfada223b..086b8c7990 100644 --- a/disassembler/Android.bp +++ b/disassembler/Android.bp @@ -47,8 +47,8 @@ art_cc_library { art_cc_library { name: "libartd-disassembler", defaults: [ - "libart-disassembler-defaults", "art_debug_defaults", + "libart-disassembler-defaults", ], shared_libs: [ // For disassembler_arm*. diff --git a/imgdiag/Android.bp b/imgdiag/Android.bp index eaeb78efa4..9459bb5504 100644 --- a/imgdiag/Android.bp +++ b/imgdiag/Android.bp @@ -64,8 +64,8 @@ art_cc_binary { art_cc_binary { name: "imgdiagd", defaults: [ - "imgdiag-defaults", "art_debug_defaults", + "imgdiag-defaults", ], shared_libs: [ "libartd", diff --git a/patchoat/Android.bp b/patchoat/Android.bp index a78f97d54c..d3bc2a754b 100644 --- a/patchoat/Android.bp +++ b/patchoat/Android.bp @@ -40,8 +40,8 @@ art_cc_binary { art_cc_binary { name: "patchoatd", defaults: [ - "patchoat-defaults", "art_debug_defaults", + "patchoat-defaults", ], shared_libs: [ "libartd", diff --git a/profman/Android.bp b/profman/Android.bp index 2dcbaee456..a327ef2c16 100644 --- a/profman/Android.bp +++ b/profman/Android.bp @@ -49,8 +49,8 @@ art_cc_binary { art_cc_binary { name: "profmand", defaults: [ - "profman-defaults", "art_debug_defaults", + "profman-defaults", ], shared_libs: [ "libartd", diff --git a/test/Android.bp b/test/Android.bp index 1679669056..599b0115b4 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -51,9 +51,9 @@ art_cc_defaults { // These really are gtests, but the gtest library comes from libart-gtest.so gtest: false, defaults: [ - "art_defaults", - "art_debug_defaults", "art_test_defaults", + "art_debug_defaults", + "art_defaults", ], shared_libs: [ @@ -128,8 +128,8 @@ art_cc_defaults { name: "libart-gtest-defaults", host_supported: true, defaults: [ - "art_defaults", "art_debug_defaults", + "art_defaults", ], shared_libs: [ "libartd", @@ -202,8 +202,8 @@ art_cc_library { cc_defaults { name: "libartagent-defaults", defaults: [ - "art_defaults", "art_test_defaults", + "art_defaults", ], shared_libs: [ "libbacktrace", @@ -234,8 +234,8 @@ art_cc_test_library { name: "libartagentd", srcs: ["900-hello-plugin/load_unload.cc"], defaults: [ - "libartagent-defaults", "art_debug_defaults", + "libartagent-defaults", ], shared_libs: ["libartd"], } @@ -313,8 +313,8 @@ art_cc_test_library { art_cc_test_library { name: "libtiagentd", defaults: [ - "libtiagent-defaults", "art_debug_defaults", + "libtiagent-defaults", ], shared_libs: ["libartd"], } @@ -340,8 +340,8 @@ art_cc_test_library { art_cc_test_library { name: "libtistressd", defaults: [ - "libtistress-defaults", "art_debug_defaults", + "libtistress-defaults", ], shared_libs: ["libartd"], } @@ -355,8 +355,8 @@ art_cc_test_library { cc_defaults { name: "libarttest-defaults", defaults: [ - "art_defaults", "art_test_defaults", + "art_defaults", ], srcs: [ "common/runtime_state.cc", @@ -421,8 +421,8 @@ art_cc_test_library { art_cc_test_library { name: "libarttestd", defaults: [ - "libarttest-defaults", "art_debug_defaults", + "libarttest-defaults", ], shared_libs: ["libartd"], } @@ -431,9 +431,9 @@ art_cc_test_library { name: "libnativebridgetest", shared_libs: ["libart"], defaults: [ - "art_defaults", - "art_debug_defaults", "art_test_defaults", + "art_debug_defaults", + "art_defaults", ], srcs: ["115-native-bridge/nativebridge.cc"], target: { |