diff options
| author | 2024-07-03 19:20:45 +0000 | |
|---|---|---|
| committer | 2024-07-03 19:20:45 +0000 | |
| commit | f55a348c244b95b2efb82097f882e867c6e2a4fd (patch) | |
| tree | dca29b7612dff2fadd8cdbb7d849fe66c8ecd00e | |
| parent | e34a02828a206797eed07d0a7bb47191dfab87e3 (diff) | |
| parent | 67eb034e315164aec2d04099d30237a72dc238c9 (diff) | |
Only depend on aconfig for android and linux host builds. am: 67eb034e31
Original change: https://android-review.googlesource.com/c/platform/art/+/3158640
Change-Id: I990a363310bef1cebf5f9231b17360510fabb286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libartbase/Android.bp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libartbase/Android.bp b/libartbase/Android.bp index 8f4ad64517..035a31aa83 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -69,7 +69,6 @@ cc_defaults { cflags: ["-DART_STATIC_LIBARTBASE"], }, static_libs: [ - "art-aconfig-flags-lib", "libcap", "libmodules-utils-build", // ZipArchive support, the order matters here to get all symbols. @@ -86,10 +85,21 @@ cc_defaults { ], export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. export_static_lib_headers: [ - "art-aconfig-flags-lib", "libcap", ], }, + linux: { + // TODO(b/350967139): Move art-aconfig-flags-lib to the top level + // when aconfig supports darwin and windows. Until then it's harder + // to use flags in code that needs to build for them, e.g. + // libartbase, libdexfile, and dexdump. + static_libs: [ + "art-aconfig-flags-lib", + ], + export_static_lib_headers: [ + "art-aconfig-flags-lib", + ], + }, not_windows: { srcs: [ "base/globals_unix.cc", @@ -98,9 +108,6 @@ cc_defaults { static: { cflags: ["-DART_STATIC_LIBARTBASE"], }, - static_libs: [ - "art-aconfig-flags-lib", - ], whole_static_libs: ["libtinyxml2"], shared_libs: [ "libziparchive", @@ -112,9 +119,6 @@ cc_defaults { "libbase", ], export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. - export_static_lib_headers: [ - "art-aconfig-flags-lib", - ], }, linux_glibc: { static_libs: [ |