commit efafd7e80dabdc621fd57c397f2968f022788bb4
author Victor Khimenko <khim@google.com> Fri Aug 21 00:46:18 2020 +0200
committer Victor Khimenko <khim@google.com> Sat Aug 22 11:05:43 2020 +0000
tree 73f19571589cae69019332a7f8efa4414c65b9df
parent 3414fdb1c586f30b8a6cd6517323c6eac943eb43

Enable RenderScript libraries for native_bridge

Bug: http://b/153609531

Test: cts-tradefed run cts --abi armeabi-v7a -m CtsRsCppTestCases

Change-Id: I35dbc6da69f28c1513df8835bd437d215786ee56

native_bridge_support.mk

diff --git a/native_bridge_support.mk b/native_bridge_support.mk
index 66133a3..b56361f 100644
--- a/native_bridge_support.mk
+++ b/native_bridge_support.mk
@@ -63,16 +63,14 @@
 NATIVE_BRIDGE_ORIG_GUEST_LIBS += \
     libandroidicu.bootstrap
 
-# TODO(b/137072946): enable to build renderscript!
-#
-#NATIVE_BRIDGE_PRODUCT_PACKAGES += \
-#    libclcore.bc \
-#    libclcore_neon.bc
-#
-#NATIVE_BRIDGE_ORIG_GUEST_LIBS += \
-#    libRS \
-#    libRSDriver \
-#    libRSSupport \
+NATIVE_BRIDGE_PRODUCT_PACKAGES += \
+    libclcore.bc \
+    libclcore_neon.bc
+
+NATIVE_BRIDGE_ORIG_GUEST_LIBS += \
+    libRS \
+    libRSDriver \
+    libnative_bridge_guest_libRSSupport
 
 # These native libraries are needed to pass CtsJniTestCases, we do not use them in any way and
 # once/if build system allows us to build dummy arm libraries they can be replaced with empty ones.
@@ -80,7 +78,7 @@
 #    libart \
 #    libvorbisidec
 
-
+# These libraries need special support on the native bridge implementation side.
 NATIVE_BRIDGE_MODIFIED_GUEST_LIBS := \
     libaaudio \
     libamidi \