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

View File

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