Snap for 6685968 from beb92c36e66e1f7638619c3de02af8b50b6b40ac to mainline-release
Change-Id: I419f7538108ce60c7d89b53947838746c99b6b88
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,
diff --git a/driver/runtime/Android.mk b/driver/runtime/Android.mk
index 71b5ab2..157841b 100755
--- a/driver/runtime/Android.mk
+++ b/driver/runtime/Android.mk
@@ -129,20 +129,18 @@
include $(LOCAL_PATH)/build_bc_lib.mk
endif
-# Build a NEON-enabled version of the library (if possible)
+# Build a NEON-enabled version of the library
# Only build on 32-bit, because we don't need a 64-bit NEON lib
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
- include $(CLEAR_VARS)
+include $(CLEAR_VARS)
- LOCAL_32_BIT_ONLY := true
+LOCAL_32_BIT_ONLY := true
- LOCAL_MODULE := libclcore_neon.bc
- LOCAL_CFLAGS += $(clcore_cflags)
- LOCAL_SRC_FILES := $(clcore_neon_files)
- LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON
+LOCAL_MODULE := libclcore_neon.bc
+LOCAL_CFLAGS += $(clcore_cflags)
+LOCAL_SRC_FILES := $(clcore_neon_files)
+LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON
- include $(LOCAL_PATH)/build_bc_lib.mk
-endif
+include $(LOCAL_PATH)/build_bc_lib.mk
# Build a version of the library with debug info
include $(CLEAR_VARS)
