Merge "Fix build error of sysprop_library in namespace"

This commit is contained in:
Treehugger Robot 2020-05-05 05:50:02 +00:00 committed by Gerrit Code Review
commit 0a80524957
1 changed files with 6 additions and 4 deletions

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) {