commit 0a8052495763fad093735b328b19db9b5b5e5fa5
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 05 05:50:02 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 05 05:50:02 2020 +0000
tree 97c5ee4b5ff8d67915142d84829da48f5c3ecb4f
parent baf8c3a804b4fd71ddf256802f0650be1b0e7e3d
parent 69cf09e1fd2222b769e1c96515ee2608a7174f8e

Merge "Fix build error of sysprop_library in namespace"

sysprop/sysprop_library.go

diff --git a/sysprop/sysprop_library.go b/sysprop/sysprop_library.go
index 0932873..9f27647 100644
--- a/sysprop/sysprop_library.go
+++ b/sysprop/sysprop_library.go
@@ -494,11 +494,13 @@
 		})
 	}
 
-	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) {