From 974ff63e656c482accdfcb3734ecf5253901334c Mon Sep 17 00:00:00 2001 From: Cheng Gu Date: Tue, 2 Jul 2024 20:18:26 +0000 Subject: [PATCH] Make some common libs apex_available Makes some common libs available to "anyapex". Bug: 318597144 Bug: 350759487 Test: make Change-Id: I26d80d1358bf2fccf4cc6f95885d36d19b94d5ff --- common/aidl/Android.bp | 8 +++++--- common/support/Android.bp | 3 +-- graphics/common/aidl/Android.bp | 7 +++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp index 1f5742d526..904a3d90e9 100644 --- a/common/aidl/Android.bp +++ b/common/aidl/Android.bp @@ -20,16 +20,18 @@ aidl_interface { backend: { java: { sdk_version: "module_current", + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], }, cpp: { enabled: false, }, ndk: { apex_available: [ + "//apex_available:anyapex", "//apex_available:platform", - "com.android.btservices", - "com.android.media.swcodec", - "com.android.neuralnetworks", ], min_sdk_version: "29", }, diff --git a/common/support/Android.bp b/common/support/Android.bp index 56700fad9a..aba5d6b51d 100644 --- a/common/support/Android.bp +++ b/common/support/Android.bp @@ -24,9 +24,8 @@ cc_library_static { "libcutils", ], apex_available: [ + "//apex_available:anyapex", "//apex_available:platform", - "com.android.neuralnetworks", - "com.android.media.swcodec", ], min_sdk_version: "29", } diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp index 4f5c3d9649..c28da4ceb6 100644 --- a/graphics/common/aidl/Android.bp +++ b/graphics/common/aidl/Android.bp @@ -24,15 +24,18 @@ aidl_interface { java: { enabled: true, platform_apis: true, + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], }, cpp: { enabled: false, }, ndk: { apex_available: [ + "//apex_available:anyapex", "//apex_available:platform", - "com.android.media.swcodec", - "com.android.neuralnetworks", ], min_sdk_version: "29", },