diff options
author | Elliott Hughes <enh@google.com> | 2023-02-15 23:43:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-15 23:43:05 +0000 |
commit | 6cccd7766871cbfdb06a9a82ea9c16f944e43c25 (patch) | |
tree | 975b14bec2bde3cc8a75bb47ea0e946f65431db0 | |
parent | e4db84cf1183145efd7a726bdbbabb797d0eff5d (diff) | |
parent | 1c1e8aaa8d79c32e1dad6b42fad02b4410c732c8 (diff) | |
download | zlib-6cccd7766871cbfdb06a9a82ea9c16f944e43c25.tar.gz |
Merge "zlib: changes so external/angle can reuse this copy of zlib." am: 4d02aae000 am: bfa589a94c am: 1c1e8aaa8d
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2359720
Change-Id: I83e1f017f283ec0101d83127a08ae9041e4cae4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 69 |
1 files changed, 50 insertions, 19 deletions
@@ -98,7 +98,15 @@ cc_defaults { ], stl: "none", export_include_dirs: ["."], - srcs: libz_srcs, + + host_supported: true, + native_bridge_supported: true, + + vendor_available: true, + product_available: true, + ramdisk_available: true, + vendor_ramdisk_available: true, + recovery_available: true, arch: { arm: { @@ -139,6 +147,9 @@ cc_defaults { "-DARMV8_OS_MACOS", ], }, + linux_bionic: { + enabled: true, + }, linux_arm64: { cflags: [ // Since we're building for the platform, we claim to be Linux rather than @@ -147,6 +158,9 @@ cc_defaults { "-DARMV8_OS_LINUX", ], }, + windows: { + enabled: true, + }, }, } @@ -154,29 +168,15 @@ cc_library { name: "libz", defaults: ["libz_defaults"], - host_supported: true, + whole_static_libs: ["libz_static"], + unique_host_soname: true, static_ndk_lib: true, - vendor_available: true, - product_available: true, vndk: { enabled: true, support_system_process: true, }, - ramdisk_available: true, - vendor_ramdisk_available: true, - recovery_available: true, - native_bridge_supported: true, - - target: { - linux_bionic: { - enabled: true, - }, - windows: { - enabled: true, - }, - }, stubs: { versions: [ @@ -187,6 +187,21 @@ cc_library { }, } +cc_library { + name: "libz_static", + defaults: ["libz_defaults"], + visibility: ["//external/angle"], + + srcs: libz_srcs, + + sdk_version: "minimum", + + apex_available: [ + "com.android.runtime", + "//apex_available:platform", + ], +} + // A more stable build of libz. Build configuration of this library should be // the same for different targets. This is only used by imgdiff. @@ -254,22 +269,38 @@ cc_binary { }, } +cc_library { + name: "zlib_google_compression_utils_portable", + defaults: ["libz_defaults"], + srcs: [ + "google/compression_utils_portable.cc", + ], + export_include_dirs: ["google"], + host_supported: true, + shared_libs: ["libz"], + sdk_version: "minimum", + visibility: ["//external/angle"], + apex_available: [ + "com.android.runtime", + "//apex_available:platform", + ], +} + cc_test { name: "zlib_tests", srcs: [ "contrib/tests/infcover.cc", "contrib/tests/utils_unittest.cc", - "google/compression_utils_portable.cc", ], cflags: [ "-Wno-unused-parameter", ], include_dirs: [ - "external/zlib/google", // These tests include "gtest.h" rather than the usual "gtest/gtest.h". "external/googletest/googletest/include/gtest/", ], shared_libs: ["libz"], + static_libs: ["zlib_google_compression_utils_portable"], host_supported: true, test_suites: ["device-tests"], } |