Remove old vndk logic
Everything should have been handled by BOARD_VNDK_VERSION for years now.
Bug: 122954981
Test: treehugger
Change-Id: If54e5850deaecfe765e0f115836aa11528ced2cf
diff --git a/device-common.mk b/device-common.mk
index 5d38628..9013f03 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -247,38 +247,6 @@
PRODUCT_COPY_FILES += \
device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \
-PRODUCT_PACKAGES += \
- android.hardware.renderscript@1.0.vndk-sp\
- android.hardware.graphics.composer@2.1.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\
- libvndksupport.vndk-sp\
- libbinder.vndk-sp\
- libhwbinder.vndk-sp\
- libbase.vndk-sp\
- libfmq.vndk-sp\
- libcutils.vndk-sp\
- libhardware.vndk-sp\
- libhidlbase.vndk-sp\
- libhidltransport.vndk-sp\
- libui.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\
- libion.vndk-sp\
-
# Health
PRODUCT_PACKAGES += \
android.hardware.health@2.0-service \
diff --git a/vndk/Android.mk b/vndk/Android.mk
deleted file mode 100644
index b6a4f74..0000000
--- a/vndk/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-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))))