diff options
| -rw-r--r-- | libs/binder/ndk/Android.bp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index 99f793403c..4e02aceb86 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -218,7 +218,6 @@ cc_library_headers { name: "libbinder_headers_platform_shared", export_include_dirs: ["include_cpp"], vendor_available: true, - product_available: true, recovery_available: true, host_supported: true, // TODO(b/153609531): remove when no longer needed. @@ -231,9 +230,9 @@ cc_library_headers { }, apex_available: [ "//apex_available:platform", - "//apex_available:anyapex", + "com.android.media", + "com.android.media.swcodec", ], - sdk_version: "29", // some APEXes require this, good to test headers against old SDK min_sdk_version: "29", } @@ -247,7 +246,19 @@ ndk_headers { license: "NOTICE", } -// include_cpp are packaged in development/build/sdk.atree with the AIDL compiler +// TODO(b/160624671): package with the aidl compiler +ndk_headers { + name: "libbinder_ndk_helper_headers", + from: "include_cpp/android", + to: "android", + srcs: [ + "include_cpp/android/*.h", + ], + license: "NOTICE", + // These are intentionally not C. It's a mistake that they're in the NDK. + // See the bug above. + skip_verification: true, +} ndk_library { name: "libbinder_ndk", @@ -255,5 +266,6 @@ ndk_library { first_version: "29", export_header_libs: [ "libbinder_ndk_headers", + "libbinder_ndk_helper_headers", ], } |