hikey960: Disable ARM renderscript driver
It is not compatible with treble as it needs additional dependencies to
be built and installed to /vendor. There is also a conflicting rule to
build android.hardware.renderscript@1.0.so and we are about to
deprecate support for this.
build/make/core/base_rules.mk:294: warning: ignoring old commands for target
`out/target/product/hikey960/obj_arm/lib/android.hardware.renderscript@1.0-impl.so'
Bug: 77611511
Bug: 77909036
Bug: 110479079
Change-Id: I4c0f6643c5f9000c6a2131fd6b1d4170fe8b07f4
Signed-off-by: Alistair Strachan <astrachan@google.com>
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 20001d4..30c1b0d 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -46,8 +46,8 @@
PRODUCT_PACKAGES += gralloc.hikey960
#binary blobs from ARM
-PRODUCT_PACKAGES += libGLES_mali.so libbccArm.so libRSDriverArm.so libmalicore.bc \
- vulkan.hikey960.so android.hardware.renderscript@1.0-impl.so \
+PRODUCT_PACKAGES += libGLES_mali.so \
+ vulkan.hikey960.so \
END_USER_LICENCE_AGREEMENT.txt
PRODUCT_PACKAGES += power.hikey960
diff --git a/mali/bifrost/Android.mk b/mali/bifrost/Android.mk
index 22fd3bd..9fccbe8 100644
--- a/mali/bifrost/Android.mk
+++ b/mali/bifrost/Android.mk
@@ -22,50 +22,6 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := libbccArm.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 := 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 := android.hardware.renderscript@1.0-impl.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_STRIP_MODULE := false
-LOCAL_SRC_FILES_arm := lib/hw/$(LOCAL_MODULE)
-LOCAL_SRC_FILES_arm64 := lib64/hw/$(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
LOCAL_STRIP_MODULE := false