diff --git a/base.mk b/base.mk
index 2f314ca..993c762 100644
--- a/base.mk
+++ b/base.mk
@@ -11,7 +11,6 @@
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy
 DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay
 
-$(call inherit-product, vendor/vndk/vndk.mk)
 $(call inherit-product, vendor/hardware_overlay/overlay.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
diff --git a/generate.sh b/generate.sh
index 721a156..e768283 100644
--- a/generate.sh
+++ b/generate.sh
@@ -15,6 +15,7 @@
 				apps_script=""
 				apps_name=""
 				extra_packages=""
+                vndk="vndk.mk"
 				if [ "$apps" == "gapps" ];then
 					apps_suffix="g"
 					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
@@ -35,6 +36,9 @@
 					apps_script=''
 					apps_name="vanilla"
 				fi
+                if [ "$arch" == "arm" ];then
+                    vndk="vndk32.mk"
+                fi
 
 				su_suffix='N'
 				if [ "$su" == "yes" ];then
@@ -52,6 +56,7 @@
 				cat > ${target}.mk << EOF
 \$(call inherit-product, device/phh/treble/base-pre.mk)
 include build/make/target/product/treble_common.mk
+\$(call inherit-product, vendor/vndk/${vndk})
 \$(call inherit-product, device/phh/treble/base.mk)
 $apps_script
 $rom_script