diff --git a/sdm660.mk b/sdm660.mk
index 9ad08ecc..d1d5a100 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -560,7 +560,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libdng_sdk.vendor_32 \
     libstdc++.vendor_32  \
-    vndk-ext \
     com.android.vndk.current.on_vendor
 
 PRODUCT_COPY_FILES += \
diff --git a/vndk/Android.mk b/vndk/Android.mk
deleted file mode 100644
index 20db4295..00000000
--- a/vndk/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/vndk-ext-libs.mk
-
-define define-vndk-lib
-include $$(CLEAR_VARS)
-LOCAL_MODULE := $1.vndk-ext-gen
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$3,)/$1.so
-LOCAL_STRIP_MODULE := false
-LOCAL_MULTILIB := $2
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := $$(basename $1).so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-LOCAL_CHECK_ELF_FILES := false
-include $$(BUILD_PREBUILT)
-endef
-
-$(foreach lib,$(EXTRA_VENDOR_LIBRARIES_32),\
-    $(eval $(call define-vndk-lib,$(lib),32,$(TARGET_2ND_ARCH_VAR_PREFIX))))
-
-$(foreach lib,$(EXTRA_VENDOR_LIBRARIES_64),\
-    $(eval $(call define-vndk-lib,$(lib),first,)))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vndk-ext
-LOCAL_MODULE_TAGS := optional
-LOCAL_CHECK_ELF_FILES := false
-LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES_32) $(EXTRA_VENDOR_LIBRARIES_64))
-include $(BUILD_PHONY_PACKAGE)
diff --git a/vndk/vndk-ext-libs.mk b/vndk/vndk-ext-libs.mk
deleted file mode 100644
index c409e91f..00000000
--- a/vndk/vndk-ext-libs.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-EXTRA_VENDOR_LIBRARIES_32 := \
-    libandroidicu \
-    libaudioclient \
-    libaudiomanager \
-    libaudiopolicy \
-    libbufferhub \
-    libbufferhubqueue \
-    libcamera_client \
-    libft2 \
-    libgui \
-    libharfbuzz_ng \
-    libheif \
-    libicui18n \
-    libinput \
-    libmedia \
-    libmediametrics \
-    libmediautils \
-    libmemunreachable \
-    libminikin \
-    libnblog \
-    libpackagelistparser \
-    libpdx_default_transport \
-    libselinux \
-    libstdc++ \
-    libsonivox \
-    libvibrator
-
-EXTRA_VENDOR_LIBRARIES_64 := \
-    libstdc++ \
-    libpowermanager
-
-EXTRA_SYSTEM_LIBRARIES_64 := \
-    libblasV8