diff options
Diffstat (limited to 'libutils/Android.bp')
| -rw-r--r-- | libutils/Android.bp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp index 019a3687a..13e4c02de 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -28,18 +28,16 @@ cc_library_headers { min_sdk_version: "apex_inherit", header_libs: [ - "libbase_headers", - "libcutils_headers", "liblog_headers", - "libprocessgroup_headers", "libsystem_headers", + "libcutils_headers", + "libprocessgroup_headers", ], export_header_lib_headers: [ - "libbase_headers", - "libcutils_headers", "liblog_headers", - "libprocessgroup_headers", "libsystem_headers", + "libcutils_headers", + "libprocessgroup_headers", ], export_include_dirs: ["include"], @@ -48,11 +46,13 @@ cc_library_headers { header_libs: ["libbacktrace_headers"], export_header_lib_headers: ["libbacktrace_headers"], }, - host_linux: { + linux_glibc: { header_libs: ["libbacktrace_headers"], export_header_lib_headers: ["libbacktrace_headers"], }, linux_bionic: { + header_libs: ["libbacktrace_headers"], + export_header_lib_headers: ["libbacktrace_headers"], enabled: true, }, windows: { @@ -76,7 +76,6 @@ cc_defaults { "-Wall", "-Werror", "-Wno-exit-time-destructors", - "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION", ], header_libs: [ "libbase_headers", @@ -99,6 +98,8 @@ cc_defaults { cflags: ["-fvisibility=protected"], shared_libs: [ + "libprocessgroup", + "libdl", "libvndksupport", ], @@ -129,9 +130,6 @@ cc_defaults { enabled: true, }, }, - fuzz_config: { - cc: ["smoreland@google.com"], - }, } cc_library { @@ -180,12 +178,6 @@ cc_library { "//apex_available:platform", ], min_sdk_version: "apex_inherit", - - afdo: true, - - header_abi_checker: { - diff_flags: ["-allow-adding-removing-weak-symbols"], - }, } cc_library { @@ -193,7 +185,6 @@ cc_library { defaults: ["libutils_defaults"], // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - min_sdk_version: "29", srcs: [ "CallStack.cpp", @@ -307,14 +298,13 @@ cc_test { srcs: [ "BitSet_test.cpp", - "Errors_test.cpp", "FileMap_test.cpp", "LruCache_test.cpp", "Mutex_test.cpp", "SharedBuffer_test.cpp", "Singleton_test.cpp", - "String16_test.cpp", "String8_test.cpp", + "String16_test.cpp", "StrongPointer_test.cpp", "Timers_test.cpp", "Unicode_test.cpp", @@ -373,7 +363,6 @@ cc_test_library { "-Wall", "-Werror", ], - header_libs: ["libutils_headers"], } cc_test_library { @@ -386,7 +375,6 @@ cc_test_library { "-Werror", ], shared_libs: ["libutils_test_singleton1"], - header_libs: ["libutils_headers"], } cc_benchmark { |