commit 485e6ebb4c0a7949a70dd25ffe812c20c9f1c8e2
author Jaewoong Jung <jungjw@google.com> Fri Nov 16 15:05:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 16 15:05:07 2018 +0000
tree 85bada956c543bc11bd373a34d9ff9dd0a44f339
parent 8ba38f45ac50c4637e1823b09f9d352442eb3f23
parent 16c7d3d26308225c2456232f945adf3f74f1673a

Merge "Revert "Revert "Revert "Revert "Export static libraries."""""

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 177856e..81e969d 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -570,7 +570,7 @@
 	manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "manifest.json"))
 
 	fcName := proptools.StringDefault(a.properties.File_contexts, a.ModuleBase.Name())
-	fileContextsPath := "system/sepolicy/apex/" + fcName + "_file_contexts"
+	fileContextsPath := "system/sepolicy/apex/" + fcName + "-file_contexts"
 	fileContextsOptionalPath := android.ExistentPathForSource(ctx, fileContextsPath)
 	if !fileContextsOptionalPath.Valid() {
 		ctx.ModuleErrorf("Cannot find file_contexts file: %q", fileContextsPath)