From 80c41e7771db233d64f039aaa5edf82ee0f3efe9 Mon Sep 17 00:00:00 2001 From: Ben Nissan Date: Wed, 18 May 2022 21:22:20 +0000 Subject: [PATCH 1/8] Add apex_available for AdServices This CL enables apex availability for AdServices, which depends on this package via build targets being added in tflite-support. Test: m Bug: 228842813 Change-Id: Ia66ef12c6632d5f69cd58248604afca2357ec87a --- Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.bp b/Android.bp index d852d62af4..912cec04d9 100644 --- a/Android.bp +++ b/Android.bp @@ -133,6 +133,10 @@ cc_library_static { sdk_version: "9", stl: "c++_static", + apex_available: [ + "//apex_available:platform", + "com.android.adservices", + ], } // C++ lite library for the platform and host. From b12f5ef08a2ed1704e91e5f61e83cc61393fae31 Mon Sep 17 00:00:00 2001 From: Akshay Miterani Date: Thu, 26 May 2022 04:03:17 +0000 Subject: [PATCH 2/8] Set min_sdk_version: "33" for libprotobuf-cpp-lite-ndk Test: make Change-Id: Id9bd65937d13d4d3e3a80cdb7dd2d6b2bd78aa1e --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 912cec04d9..88e9b12475 100644 --- a/Android.bp +++ b/Android.bp @@ -137,6 +137,7 @@ cc_library_static { "//apex_available:platform", "com.android.adservices", ], + min_sdk_version: "33", } // C++ lite library for the platform and host. From acead228184c25e40cfd0436bc7e7da6b4f5351d Mon Sep 17 00:00:00 2001 From: youngtaecha Date: Fri, 17 Jun 2022 17:50:25 +0000 Subject: [PATCH 3/8] CellBroadcast metrics improvement - add 'com.android.cellbroadcast' to 'apex_available' of 'libprotobuf-java-lite' Test: Build Success Change-Id: Id8464b2c6de522b48e078b563a83dcf16c517c87 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 88e9b12475..5773912376 100644 --- a/Android.bp +++ b/Android.bp @@ -622,6 +622,7 @@ java_library_static { "com.android.extservices", "com.android.car.framework", "com.android.uwb", + "com.android.cellbroadcast", ], } From fe87f37c2f9de27cf11b275bdeec2bcffe946616 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Fri, 15 Jul 2022 17:34:21 -0400 Subject: [PATCH 4/8] Add adservices in apex_availble. We need to build adservices with mdd in static_libs and it requires protobuf add adservices to apex_availble property. Bug: 239230416 Test: mma Change-Id: I6b7175638bc42c07a92a32b0742747ba7689f7bc --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 5773912376..dcbb576b50 100644 --- a/Android.bp +++ b/Android.bp @@ -623,6 +623,7 @@ java_library_static { "com.android.car.framework", "com.android.uwb", "com.android.cellbroadcast", + "com.android.adservices", ], } From 404c65b237ee833e3551b26011dc81c5f7fa4fff Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 26 Jul 2022 17:38:16 +0000 Subject: [PATCH 5/8] Add com.android.ondevicepersonalization to libprotobuf-java-lite. Test: TH Bug: 240200006 Change-Id: Ic343a867616e179c009e13e0ff406a244b1226ee --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index dcbb576b50..9d38ce34af 100644 --- a/Android.bp +++ b/Android.bp @@ -624,6 +624,7 @@ java_library_static { "com.android.uwb", "com.android.cellbroadcast", "com.android.adservices", + "com.android.ondevicepersonalization", ], } From 19abda9b338879ffe53a8e75fff9c2759dbb0d2c Mon Sep 17 00:00:00 2001 From: Alyssa Ketpreechasawat Date: Mon, 8 Aug 2022 16:49:08 +0000 Subject: [PATCH 6/8] Change protobuf libs to be available to anyapex Bug: 151068271 Test: presubmit Change-Id: I046cb58c76b708ed84685eaa36f3ac3c70dddc9f --- Android.bp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Android.bp b/Android.bp index 9d38ce34af..6090be25da 100644 --- a/Android.bp +++ b/Android.bp @@ -468,7 +468,6 @@ java_library_static { apex_available: [ "//apex_available:platform", - // TODO(b/151068271) switch this to //apex_available:anyapex "com.android.tethering", "com.android.wifi", ], @@ -496,7 +495,6 @@ java_library_static { apex_available: [ "//apex_available:platform", - // TODO(b/151068271) switch this to //apex_available:anyapex "com.android.bluetooth", ], } @@ -614,17 +612,7 @@ java_library_static { apex_available: [ "//apex_available:platform", - // TODO(b/151068271) switch below to //apex_available:anyapex - "com.android.permission", - "com.android.bluetooth", - "com.android.tethering", - "com.android.wifi", - "com.android.extservices", - "com.android.car.framework", - "com.android.uwb", - "com.android.cellbroadcast", - "com.android.adservices", - "com.android.ondevicepersonalization", + "//apex_available:anyapex", ], } From 25f387a1075eeb038309b32e9cfc1b5fee1b7284 Mon Sep 17 00:00:00 2001 From: Neha Pattan Date: Fri, 3 Feb 2023 23:01:34 +0000 Subject: [PATCH 7/8] (TM-MP) Rb back compat: Base changes Bug: 263816046 Test: manual Change-Id: I32992435e6586a7d2c568101ae112ccc2d56df75 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 6090be25da..4b7e49b59a 100644 --- a/Android.bp +++ b/Android.bp @@ -136,6 +136,7 @@ cc_library_static { apex_available: [ "//apex_available:platform", "com.android.adservices", + "com.android.extservices", ], min_sdk_version: "33", } From eb630594faea0449aeb20aef1898efdc1e0a4fe6 Mon Sep 17 00:00:00 2001 From: Neha Pattan Date: Fri, 17 Feb 2023 17:37:12 +0000 Subject: [PATCH 8/8] Allow "libprotobuf-cpp-lite-ndk" on min_sdk 30, required for AdExtServices Apk. Bug: 263816046 Test: manual Change-Id: Ib182186b2729a480aabe21413d59d2ebe1298c1e --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 4b7e49b59a..98c0736ec3 100644 --- a/Android.bp +++ b/Android.bp @@ -138,7 +138,7 @@ cc_library_static { "com.android.adservices", "com.android.extservices", ], - min_sdk_version: "33", + min_sdk_version: "30", } // C++ lite library for the platform and host.