From a6764b2e0dcd63745b6abd12928bdab15d48494c Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Tue, 7 Aug 2018 17:43:39 -0700
Subject: hikey960: bifrost: Enable renderscript binaries

Re-add the renderscript binaries to the build and
add sepolicy and manifest changes needed to support
ARM's renderscript library.

Change-Id: I743ffe93a4e41d73122dc0d2a1ad8eb962597649
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 hikey960/device-hikey960.mk |  7 +++++++
 mali/bifrost/Android.mk     | 31 +++++++++++++++++++++++++++++++
 manifest.xml                |  9 +++++++++
 sepolicy/app.te             |  1 +
 sepolicy/file_contexts      | 10 ++++++++++
 5 files changed, 58 insertions(+)
 create mode 100644 sepolicy/app.te

diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 0a39bb57..319f31aa 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -48,6 +48,9 @@ PRODUCT_PACKAGES += gralloc.hikey960
 #binary blobs from ARM
 PRODUCT_PACKAGES +=	libGLES_mali.so \
 			vulkan.hikey960.so \
+			libbccArm.so \
+			libRSDriverArm.so \
+			libmalicore.bc \
 			END_USER_LICENCE_AGREEMENT.txt
 PRODUCT_COPY_FILES += \
         $(LOCAL_PATH)/../mali/bifrost/lib/libclcore.bc:vendor/lib/libclcore.bc \
@@ -58,6 +61,10 @@ PRODUCT_COPY_FILES += \
         $(LOCAL_PATH)/../mali/bifrost/lib64/libLLVM.so:vendor/lib64/libLLVM.so
 
 
+OVERRIDE_RS_DRIVER := libRSDriverArm.so
+PRODUCT_PACKAGES += android.hardware.renderscript@1.0-impl
+PRODUCT_PACKAGES += vndk_package
+
 PRODUCT_PACKAGES += power.hikey960
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.usb.controller=ff100000.dwc3
diff --git a/mali/bifrost/Android.mk b/mali/bifrost/Android.mk
index 9fccbe86..a4f6aced 100644
--- a/mali/bifrost/Android.mk
+++ b/mali/bifrost/Android.mk
@@ -21,6 +21,37 @@ LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl/
 LOCAL_MULTILIB := both
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libbccArm.so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_STRIP_MODULE := false
+LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
+LOCAL_MULTILIB := 64
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libRSDriverArm.so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_STRIP_MODULE := false
+LOCAL_SRC_FILES_arm := lib/$(LOCAL_MODULE)
+LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
+LOCAL_MULTILIB := both
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmalicore.bc
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_STRIP_MODULE := false
+LOCAL_SRC_FILES_arm := lib/$(LOCAL_MODULE)
+LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
+LOCAL_MULTILIB := both
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := vulkan.hikey960.so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
diff --git a/manifest.xml b/manifest.xml
index b90111d4..ed91bd25 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -165,4 +165,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.renderscript</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+            <interface>
+            <name>IDevice</name>
+        <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/sepolicy/app.te b/sepolicy/app.te
new file mode 100644
index 00000000..512230b7
--- /dev/null
+++ b/sepolicy/app.te
@@ -0,0 +1 @@
+allow appdomain same_process_hal_file:file { read execute_no_trans };
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index a356e0b0..dacdb9f4 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -32,3 +32,13 @@
 
 /dev/block/platform/soc/f723d000\.dwmmc0/by-name/cache u:object_r:cache_block_device:s0
 /dev/block/platform/soc/f723d000\.dwmmc0/by-name/userdata u:object_r:userdata_block_device:s0
+
+
+/vendor/lib(64)?/libRSDriverArm\.so u:object_r:same_process_hal_file:s0
+/vendor/lib64/libbccArm\.so u:object_r:same_process_hal_file:s0
+/vendor/lib64/libbcc\.so u:object_r:same_process_hal_file:s0
+/vendor/lib64/libLLVM_android\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libclcore\.bc u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libmalicore\.bc u:object_r:same_process_hal_file:s0
+/vendor/lib/libclcore_neon\.bc u:object_r:same_process_hal_file:s0
+/vendor/bin/bcc                u:object_r:same_process_hal_file:s0
-- 
cgit v1.2.3