Merge "Revert "Rename LOCAL_USE_VNDK"" into main

This commit is contained in:
Treehugger Robot
2024-02-02 10:38:49 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 9 deletions

View File

@@ -63,10 +63,8 @@ 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.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)
},