Make libRSDriver buildable for native bridge am: 6baf771fa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12128054
Change-Id: If695fff7002560c6cab0c228fedfe8571d035f08
diff --git a/Android.bp b/Android.bp
index 2742741..9fdfa9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@
cc_library_shared {
name: "libRSDriver",
vendor_available: true,
+ native_bridge_supported: true,
vndk: {
enabled: true,
support_system_process: true,
@@ -84,6 +85,27 @@
},
},
},
+
+ target: {
+ native_bridge : {
+ header_libs: [
+ "libnativewindow_headers",
+ "media_ndk_headers",
+ ],
+ shared_libs: [
+ "libnative_bridge_guest_libEGL",
+ "libnative_bridge_guest_libGLESv1_CM",
+ "libnative_bridge_guest_libGLESv2",
+ "libnative_bridge_guest_libnativewindow",
+ ],
+ exclude_shared_libs: [
+ "libEGL",
+ "libGLESv1_CM",
+ "libGLESv2",
+ "libnativewindow",
+ ],
+ },
+ },
}
// Build rsg-generator ====================
@@ -141,6 +163,7 @@
cc_library_shared {
name: "libRS_internal",
vendor_available: true,
+ native_bridge_supported: true,
vndk: {
enabled: true,
support_system_process: true,
@@ -249,6 +272,29 @@
enabled: false,
},
},
+
+ target: {
+ native_bridge: {
+ header_libs: [
+ "libnativewindow_headers",
+ "media_ndk_headers",
+ ],
+ shared_libs: [
+ "libnative_bridge_guest_libEGL",
+ "libnative_bridge_guest_libGLESv1_CM",
+ "libnative_bridge_guest_libGLESv2",
+ "libnative_bridge_guest_libmediandk",
+ "libnative_bridge_guest_libnativewindow",
+ ],
+ exclude_shared_libs: [
+ "libEGL",
+ "libGLESv1_CM",
+ "libGLESv2",
+ "libmediandk",
+ "libnativewindow",
+ ],
+ },
+ },
}
cc_library_shared {
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index c409989..b8da924 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -2,6 +2,7 @@
name: "libRSCpuRef",
defaults: ["libbcc-targets"],
vendor_available: true,
+ native_bridge_supported: true,
vndk: {
enabled: true,
support_system_process: true,
