Merge "Reapply "Rename LOCAL_USE_VNDK"" into main (e5b8b973) · Commits · e / os / android_build_soong

cc/androidmk.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
		}
		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
		@@ -117,6 +116,11 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
		}
		}
		}
		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.

+4 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,10 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
		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.UseVndk() {
		entries.SetBool("LOCAL_USE_VNDK", true)
		if mod.InVendor() {
		entries.SetBool("LOCAL_IN_VENDOR", true)
		} else if mod.InProduct() {
		entries.SetBool("LOCAL_IN_PRODUCT", true)
		}
		android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles)
		},