diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:03:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:03:57 +0000 |
| commit | 7557fe18b005db334f93ff995a347aa474742557 (patch) | |
| tree | 38b6c9dfb13b7b099a77b85e14254419c184bc2e | |
| parent | f882b34df04bd41113a6d46a9319248bb6031503 (diff) | |
| parent | a8f58b3dc7a2e80fba1075281dc94192322f5771 (diff) | |
| download | grpc-grpc-android13-mainline-media-swcodec-release.tar.gz | |
Snap for 8570526 from a8f58b3dc7a2e80fba1075281dc94192322f5771 to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release
Change-Id: I91492c98a6abb3ce934ae6197aaef34cd1059557
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | METADATA | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 3edd4b6a92..5f160560dc 100644 --- a/Android.bp +++ b/Android.bp @@ -48,6 +48,15 @@ cc_defaults { ], host_supported: true, vendor_available: true, + apex_available: [ + "//apex_available:platform", + "com.android.bluetooth", + ], + shared_libs: [ + "libz", + ], + stl: "libc++", + min_sdk_version: "30" } cc_library_host_static { @@ -957,7 +966,6 @@ cc_library_static { ], whole_static_libs: [ "libgrpc_trace", - "libz", ], shared_libs: [ "liblog", @@ -1,6 +1,4 @@ third_party { - # would be NOTICE save for MPL 2.0 in: - # etc/roots.pem - # src/android/test/interop/app/src/main/assets/roots.pem + license_note: "would be NOTICE save for MPL 2.0 in: etc/roots.pem and src/android/test/interop/app/src/main/assets/roots.pem" license_type: RECIPROCAL } |