diff options
| author | Prabal Singh <prabalsingh@google.com> | 2023-10-25 08:03:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-25 08:03:11 +0000 |
| commit | 32878865e5229e797639f6f2bfce65af06381827 (patch) | |
| tree | ff6052b506c3059f9c0f6e66d682fd0ec4ab7650 | |
| parent | 491496fedef2f9810c5d3b8c25da2a40de87880d (diff) | |
| parent | f3a56c337b18888e986782217a5929d0aa0b6b9c (diff) | |
| download | private-join-and-compute-32878865e5229e797639f6f2bfce65af06381827.tar.gz | |
Define proto file group and minSdkVersion in PJC am: f3a56c337b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/private-join-and-compute/+/24733893
Change-Id: I203fe0c14c68d874dcb8b615d681e379bc208539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 74 |
1 files changed, 63 insertions, 11 deletions
@@ -15,9 +15,23 @@ cc_defaults { host_supported: true, } +filegroup { + name: "private-join-and-compute-proto", + srcs: [ + "**/*.proto", + ], + visibility: ["//packages/modules/AdServices:__subpackages__"], +} + cc_library { name: "libpjc_crypto", - visibility: ["//external/anonymous-counting-tokens:__subpackages__"], + min_sdk_version: "30", + sdk_version: "current", + stl: "libc++_static", + visibility: [ + "//external/anonymous-counting-tokens:__subpackages__", + "//packages/modules/AdServices/adservices/service-core", + ], defaults: ["libpjc_defaults"], srcs: [ "private_join_and_compute/crypto/big_num.cc", @@ -57,7 +71,7 @@ cc_library { shared_libs: [ "libcrypto", "liblog", - "libprotobuf-cpp-lite", + ], static_libs: [ "libpjc_third_party_libabsl", @@ -74,13 +88,19 @@ cc_library { integer_overflow: true, misc_undefined: ["bounds"], }, + apex_available: ["com.android.adservices", "com.android.extservices",], target: { - android: { - sanitize: { - cfi: true, - }, + host: { + static_libs: [ + "libprotobuf-cpp-lite", + ] }, - }, + android: { + static_libs: [ + "libprotobuf-cpp-lite-ndk", + ] + } + } } cc_test { @@ -97,13 +117,24 @@ cc_test { "libcrypto", "liblog", "libpjc_crypto", - "libprotobuf-cpp-lite", ], static_libs: [ "libgmock", "libpjc_third_party_libabsl", ], - test_suites: ["general-tests"] + test_suites: ["general-tests"], + target: { + host: { + static_libs: [ + "libprotobuf-cpp-lite", + ] + }, + android: { + static_libs: [ + "libprotobuf-cpp-lite-ndk", + ] + } + }, } /* This test takes longer than the bazel timeout atest uses, and there @@ -119,22 +150,36 @@ cc_test { "libcrypto", "liblog", "libpjc_crypto", - "libprotobuf-cpp-lite", ], static_libs: [ "libgmock", "libpjc_third_party_libabsl", ], + target: { + host: { + static_libs: [ + "libprotobuf-cpp-lite", + ] + }, + android: { + static_libs: [ + "libprotobuf-cpp-lite-ndk", + ] + } + } } */ cc_library_headers { name: "libpjc_third_party_libabsl_headers", + min_sdk_version: "30", + sdk_version: "current", device_supported: true, host_supported: true, export_include_dirs: [ "third_party/abseil-cpp-20230125.2/", ], + apex_available: ["com.android.adservices", "com.android.extservices",], } cc_defaults { @@ -146,8 +191,14 @@ cc_defaults { cc_library_static { name: "libpjc_third_party_libabsl", + min_sdk_version: "30", + sdk_version: "current", host_supported: true, - visibility: ["//external/anonymous-counting-tokens:__subpackages__"], + stl: "libc++_static", + visibility: [ + "//external/anonymous-counting-tokens:__subpackages__", + "//packages/modules/AdServices/adservices/service-core", + ], defaults: ["libpjc_third_party_libabsl_library_defaults"], srcs: [ "third_party/abseil-cpp-20230125.2/absl/base/internal/cycleclock.cc", @@ -334,6 +385,7 @@ cc_library_static { //"third_party/abseil-cpp-20230125.2/absl/time/time_benchmark.cc", "third_party/abseil-cpp-20230125.2/absl/time/time.cc", ], + apex_available: ["com.android.adservices", "com.android.extservices",], } cc_defaults { |