From eed53a0246572bcfd071fda9248762065df7f0e9 Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Wed, 9 Feb 2022 09:40:20 -0800 Subject: Explicit apex_available clauses Declare explicit apex availability/usage here instead of in a list hidden within the apex build tools. Bug: 215589022 Test: build Change-Id: Id4708473d2528ffdab6c91c71d31c7373749858c --- libs/gui/Android.bp | 6 ++++++ libs/gui/sysprop/Android.bp | 5 +++++ libs/nativebase/Android.bp | 4 ++++ libs/nativewindow/Android.bp | 7 ++++++- libs/ui/Android.bp | 11 +++++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index ec3587b79a..ec1134a939 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -37,6 +37,12 @@ cc_library_headers { "android.hardware.graphics.bufferqueue@2.0", ], min_sdk_version: "29", + // TODO(b/218719284) can media use be constrained to libgui_bufferqueue_static? + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], } cc_library_headers { diff --git a/libs/gui/sysprop/Android.bp b/libs/gui/sysprop/Android.bp index bddb0ac5ee..cc33e4c27d 100644 --- a/libs/gui/sysprop/Android.bp +++ b/libs/gui/sysprop/Android.bp @@ -16,4 +16,9 @@ sysprop_library { cpp: { min_sdk_version: "29", }, + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], } diff --git a/libs/nativebase/Android.bp b/libs/nativebase/Android.bp index 1a4729c610..77b23db1fc 100644 --- a/libs/nativebase/Android.bp +++ b/libs/nativebase/Android.bp @@ -45,5 +45,9 @@ cc_library_headers { enabled: true, }, }, + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + ], min_sdk_version: "29", } diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp index 928600999c..d30efa1851 100644 --- a/libs/nativewindow/Android.bp +++ b/libs/nativewindow/Android.bp @@ -47,6 +47,11 @@ cc_library_headers { // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, min_sdk_version: "29", + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], host_supported: true, } @@ -64,7 +69,7 @@ cc_library { symbol_file: "libnativewindow.map.txt", unversioned: true, override_export_include_dirs: [ - "include" + "include", ], }, export_include_dirs: [ diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index f5a22ec272..a9380c6e79 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -235,6 +235,12 @@ cc_library_shared { "libui_headers", ], min_sdk_version: "29", + // TODO(b/214400477) to remove use of GraphicBuffer + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], afdo: true, } @@ -258,6 +264,11 @@ cc_library_headers { "libmath_headers", ], min_sdk_version: "29", + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], } // defaults to enable VALIDATE_REGIONS traces -- cgit v1.2.3-59-g8ed1b