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
Merged-In: I07703f57da22d965c6ee43a672aacce0970fa0c4
Change-Id: I07703f57da22d965c6ee43a672aacce0970fa0c4
diff --git a/device.mk b/device.mk
index 7c9df61..b860a82 100755
--- a/device.mk
+++ b/device.mk
@@ -535,35 +535,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
