Merge "Fix build error of sysprop_library in namespace" am: 0a80524957 am: f7d0e1452b

Change-Id: Ibfa4f8c0cfdfa920bf407f0962c7384e48cf2f86
This commit is contained in:
Treehugger Robot
2020-05-05 06:19:24 +00:00
committed by Automerger Merge Worker

View File

@@ -494,11 +494,13 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
})
}
syspropLibrariesLock.Lock()
defer syspropLibrariesLock.Unlock()
if m.ExportedToMake() {
syspropLibrariesLock.Lock()
defer syspropLibrariesLock.Unlock()
libraries := syspropLibraries(ctx.Config())
*libraries = append(*libraries, ctx.ModuleName())
libraries := syspropLibraries(ctx.Config())
*libraries = append(*libraries, "//"+ctx.ModuleDir()+":"+ctx.ModuleName())
}
}
func syspropDepsMutator(ctx android.BottomUpMutatorContext) {