From eb9e618c70f30291b71c4e7fc503595ecdfb54f1 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 9 Mar 2020 15:23:05 +0900 Subject: Set apex_available property The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 150999716 Test: m Merged-In: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a (cherry picked from commit 0dcd4e8262f521f08a8302051ad6c81489f05754) Change-Id: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a --- Android.bp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Android.bp b/Android.bp index 1b6130a5..510efa0d 100644 --- a/Android.bp +++ b/Android.bp @@ -113,6 +113,17 @@ cc_object { ], }, }, + apex_available: [ + "//apex_available:platform", + "com.android.adbd", + "com.android.art.debug", + "com.android.art.release", + "com.android.art.testing", + "com.android.bluetooth.updatable", + "com.android.conscrypt", + "com.android.media", + "com.android.resolv", + ], } bootstrap_go_package { @@ -184,7 +195,13 @@ cc_library { apex_available: [ "//apex_available:platform", "com.android.adbd", - "test_com.android.adbd", + "com.android.art.debug", + "com.android.art.release", + "com.android.art.testing", + "com.android.bluetooth.updatable", + "com.android.conscrypt", + "com.android.media", + "com.android.resolv", ], } @@ -219,7 +236,6 @@ cc_library_static { apex_available: [ "//apex_available:platform", "com.android.neuralnetworks", - "test_com.android.neuralnetworks", ], defaults: [ "libcrypto_bcm_sources", @@ -262,7 +278,8 @@ cc_library { apex_available: [ "//apex_available:platform", "com.android.adbd", - "test_com.android.adbd", + "com.android.conscrypt", + "com.android.resolv", ], } -- cgit v1.2.3