diff --git a/cc/androidmk.go b/cc/androidmk.go
index 20673e8..c39668c 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -107,6 +107,7 @@
 				}
 				entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType)
 				if c.InVendorOrProduct() {
+					entries.SetBool("LOCAL_USE_VNDK", true)
 					if c.IsVndk() && !c.static() {
 						entries.SetString("LOCAL_SOONG_VNDK_VERSION", c.VndkVersion())
 						// VNDK libraries available to vendor are not installed because
@@ -116,11 +117,6 @@
 						}
 					}
 				}
-				if c.InVendor() {
-					entries.SetBool("LOCAL_IN_VENDOR", true)
-				} else if c.InProduct() {
-					entries.SetBool("LOCAL_IN_PRODUCT", true)
-				}
 				if c.Properties.IsSdkVariant && c.Properties.SdkAndPlatformVariantVisibleToMake {
 					// Make the SDK variant uninstallable so that there are not two rules to install
 					// to the same location.
diff --git a/rust/androidmk.go b/rust/androidmk.go
index e0cb3ce..17fd2d8 100644
--- a/rust/androidmk.go
+++ b/rust/androidmk.go
@@ -63,10 +63,8 @@
 				entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.transitiveAndroidMkSharedLibs.ToList()...)
 				entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...)
 				entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType)
-				if mod.InVendor() {
-					entries.SetBool("LOCAL_IN_VENDOR", true)
-				} else if mod.InProduct() {
-					entries.SetBool("LOCAL_IN_PRODUCT", true)
+				if mod.UseVndk() {
+					entries.SetBool("LOCAL_USE_VNDK", true)
 				}
 				android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles)
 			},