diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-09-07 17:15:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-07 17:15:07 +0000 |
| commit | d176e93d66df409e2eee5343efd26b35c73fb71b (patch) | |
| tree | 0c8bd5250f9c12330c2aa6129e73990cfc25dae9 /oatdump | |
| parent | ac9fa1811e0b7ab33d80df4476d5b09db058e939 (diff) | |
| parent | ec5ed06b59a3b85e7f98ffc50e0539e5a77d1ba1 (diff) | |
| download | art-d176e93d66df409e2eee5343efd26b35c73fb71b.tar.gz art-d176e93d66df409e2eee5343efd26b35c73fb71b.tar.bz2 art-d176e93d66df409e2eee5343efd26b35c73fb71b.zip | |
Merge "ART: Refactor static include list"
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/Android.bp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/oatdump/Android.bp b/oatdump/Android.bp index 3cd8ae0f6d..070449967c 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -66,7 +66,9 @@ cc_defaults { name: "oatdumps-defaults", device_supported: false, static_executable: true, - defaults: ["oatdump-defaults"], + defaults: [ + "oatdump-defaults", + ], target: { darwin: { enabled: false, @@ -80,18 +82,20 @@ cc_defaults { // Try to get rid of it. "-z muldefs", ], - static_libs: art_static_dependencies, + static_libs: ["libsigchain_dummy"], } art_cc_binary { name: "oatdumps", - defaults: ["oatdumps-defaults"], + defaults: [ + "libart_static_defaults", + "libartbase_static_defaults", + "libdexfile_static_defaults", + "libprofile_static_defaults", + "libart-compiler_static_defaults", + "oatdumps-defaults", + ], static_libs: [ - "libart", - "libdexfile", - "libprofile", - "libartbase", - "libart-compiler", "libart-disassembler", "libvixl-arm", "libvixl-arm64", @@ -102,6 +106,11 @@ art_cc_binary { name: "oatdumpds", defaults: [ "art_debug_defaults", + "libartd_static_defaults", + "libartbased_static_defaults", + "libdexfiled_static_defaults", + "libprofiled_static_defaults", + "libartd-compiler_static_defaults", "oatdumps-defaults", ], target: { @@ -110,11 +119,6 @@ art_cc_binary { }, }, static_libs: [ - "libartd", - "libdexfiled", - "libprofiled", - "libartbased", - "libartd-compiler", "libartd-disassembler", "libvixld-arm", "libvixld-arm64", |