Remove the tricky *.vndk-sp modules
Since BOARD_VNDK_VERSION is turned on, the tricky *.vndk-sp modules
aren't needed anymore. Remove them.
Bug: 63866913
Test: build 2017 pixel, boots to the UI
Change-Id: I07703f57da22d965c6ee43a672aacce0970fa0c4
diff --git a/device.mk b/device.mk
index 86f1cac..b2f52eb 100755
--- a/device.mk
+++ b/device.mk
@@ -530,35 +530,7 @@
ro.frp.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/frp
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.vndk.version=26.1.0 \
-
-# Once BOARD_VNDK_VERSION is defined, below packages will not be used
-PRODUCT_PACKAGES += \
- android.hardware.renderscript@1.0.vndk-sp\
- android.hardware.graphics.allocator@2.0.vndk-sp\
- android.hardware.graphics.mapper@2.0.vndk-sp\
- android.hardware.graphics.common@1.0.vndk-sp\
- libhwbinder.vndk-sp\
- libbase.vndk-sp\
- libcutils.vndk-sp\
- libhardware.vndk-sp\
- libhidlbase.vndk-sp\
- libhidltransport.vndk-sp\
- libutils.vndk-sp\
- libc++.vndk-sp\
- libRS_internal.vndk-sp\
- libRSDriver.vndk-sp\
- libRSCpuRef.vndk-sp\
- libbcinfo.vndk-sp\
- libblas.vndk-sp\
- libft2.vndk-sp\
- libpng.vndk-sp\
- libcompiler_rt.vndk-sp\
- libbacktrace.vndk-sp\
- libunwind.vndk-sp\
- libunwindstack.vndk-sp\
- liblzma.vndk-sp\
- libz.vndk-sp\
+ ro.vendor.vndk.version=27.1.0 \
# Include vndk/vndk-sp/ll-ndk modules
PRODUCT_PACKAGES += vndk_package
diff --git a/vndk/Android.mk b/vndk/Android.mk
deleted file mode 100644
index 7be018e..0000000
--- a/vndk/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-ifneq ($(filter muskie walleye taimen, $(TARGET_DEVICE)),)
-LOCAL_PATH := $(call my-dir)
-
-ifndef BOARD_VNDK_VERSION
-VNDK_SP_LIBRARIES += \
- android.hardware.renderscript@1.0\
- android.hardware.graphics.allocator@2.0\
- android.hardware.graphics.mapper@2.0\
- android.hardware.graphics.common@1.0\
- libhwbinder\
- libbase\
- libcutils\
- libhardware\
- libutils\
- libc++\
- libbacktrace\
- libunwind\
- libunwindstack\
- liblzma\
- libhidlbase\
- libhidltransport\
- libz\
- libbcinfo\
- libblas\
- libcompiler_rt\
- libRS_internal\
- libRSDriver\
- libRSCpuRef\
- libft2\
- libpng\
-
-endif
-
-define add-vndk-sp-lib
-include $$(CLEAR_VARS)
-LOCAL_MODULE := $1.vndk-sp
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib/$1.so
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := $1.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_RELATIVE_PATH := vndk-sp
-include $$(BUILD_PREBUILT)
-
-include $$(CLEAR_VARS)
-LOCAL_MODULE := $1.vndk-sp
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib64/$1.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := $1.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_RELATIVE_PATH := vndk-sp
-include $$(BUILD_PREBUILT)
-endef
-
-$(foreach lib,$(VNDK_SP_LIBRARIES),\
- $(eval $(call add-vndk-sp-lib,$(lib))))
-endif # if TARGET_DEVICE is muskie or walleye
