diff options
| -rw-r--r-- | apex/apex.go | 6 | ||||
| -rw-r--r-- | apex/apex_test.go | 5 | ||||
| -rw-r--r-- | java/sdk_library.go | 79 |
3 files changed, 58 insertions, 32 deletions
diff --git a/apex/apex.go b/apex/apex.go index 53bdc1249..eec98da27 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1342,12 +1342,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { } filesInfo = append(filesInfo, af) - pf, _ := sdkLib.OutputFiles(".xml") - if len(pf) != 1 { + pf := sdkLib.XmlPermissionsFile() + if pf == nil { ctx.PropertyErrorf("java_libs", "%q failed to generate permission XML", depName) return false } - filesInfo = append(filesInfo, newApexFile(ctx, pf[0], pf[0].Base(), "etc/permissions", etc, nil)) + filesInfo = append(filesInfo, newApexFile(ctx, pf, pf.Base(), "etc/permissions", etc, nil)) return true // track transitive dependencies } else { ctx.PropertyErrorf("java_libs", "%q of type %q is not supported", depName, ctx.OtherModuleType(child)) diff --git a/apex/apex_test.go b/apex/apex_test.go index faf7ae579..8200c8748 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -3470,8 +3470,9 @@ func TestJavaSDKLibrary(t *testing.T) { "etc/permissions/foo.xml", }) // Permission XML should point to the activated path of impl jar of java_sdk_library - xml := ctx.ModuleForTests("foo", "android_common_myapex").Output("foo.xml") - ensureContains(t, xml.Args["content"], `<library name="foo" file="/apex/myapex/javalib/foo.jar"`) + sdkLibrary := ctx.ModuleForTests("foo", "android_common_myapex").Module().(*java.SdkLibrary) + xml := sdkLibrary.XmlPermissionsFileContent() + ensureContains(t, xml, `<library name="foo" file="/apex/myapex/javalib/foo.jar"`) } func TestCompatConfig(t *testing.T) { diff --git a/java/sdk_library.go b/java/sdk_library.go index fb8ae95de..e725ce9d6 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -16,6 +16,7 @@ package java import ( "android/soong/android" + "android/soong/genrule" "fmt" "io" @@ -264,6 +265,8 @@ func (module *SdkLibrary) getActiveApiScopes() apiScopes { } } +var xmlPermissionsFileTag = dependencyTag{name: "xml-permissions-file"} + func (module *SdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { useBuiltStubs := !ctx.Config().UnbundledBuildUsePrebuiltSdks() for _, apiScope := range module.getActiveApiScopes() { @@ -275,6 +278,11 @@ func (module *SdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.AddVariationDependencies(nil, apiScope.apiFileTag, module.docsName(apiScope)) } + if !proptools.Bool(module.sdkLibraryProperties.Api_only) { + // Add dependency to the rule for generating the xml permissions file + ctx.AddDependency(module, xmlPermissionsFileTag, module.genXmlPermissionsFileName()) + } + module.Library.deps(ctx) } @@ -284,8 +292,6 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) module.Library.GenerateAndroidBuildActions(ctx) } - module.buildPermissionsFile(ctx) - // Record the paths to the header jars of the library (stubs and impl). // When this java_sdk_library is depended upon from others via "libs" property, // the recorded paths will be returned depending on the link type of the caller. @@ -310,33 +316,21 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.ModuleErrorf("depends on module %q of unknown tag %q", otherName, tag) } } + if tag == xmlPermissionsFileTag { + if genRule, ok := to.(genrule.SourceFileGenerator); ok { + pf := genRule.GeneratedSourceFiles() + if len(pf) != 1 { + ctx.ModuleErrorf("%q failed to generate permission XML", otherName) + } else { + module.permissionsFile = pf[0] + } + } else { + ctx.ModuleErrorf("depends on module %q to generate xml permissions file but it does not provide any outputs", otherName) + } + } }) } -func (module *SdkLibrary) buildPermissionsFile(ctx android.ModuleContext) { - xmlContent := fmt.Sprintf(permissionsTemplate, module.BaseModuleName(), module.implPath()) - permissionsFile := android.PathForModuleOut(ctx, module.xmlFileName()) - - ctx.Build(pctx, android.BuildParams{ - Rule: android.WriteFile, - Output: permissionsFile, - Description: "Generating " + module.BaseModuleName() + " permissions", - Args: map[string]string{ - "content": xmlContent, - }, - }) - - module.permissionsFile = permissionsFile -} - -func (module *SdkLibrary) OutputFiles(tag string) (android.Paths, error) { - switch tag { - case ".xml": - return android.Paths{module.permissionsFile}, nil - } - return module.Library.OutputFiles(tag) -} - func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries { if proptools.Bool(module.sdkLibraryProperties.Api_only) { return nil @@ -423,6 +417,11 @@ func (module *SdkLibrary) xmlFileName() string { return module.BaseModuleName() + sdkXmlFileSuffix } +// Module name of the rule for generating the XML permissions file +func (module *SdkLibrary) genXmlPermissionsFileName() string { + return "gen-" + module.BaseModuleName() + sdkXmlFileSuffix +} + // Get the sdk version for use when compiling the stubs library. func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.LoadHookContext, apiScope *apiScope) string { sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library)) @@ -623,8 +622,34 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc mctx.CreateModule(DroidstubsFactory, &props) } +func (module *SdkLibrary) XmlPermissionsFile() android.Path { + return module.permissionsFile +} + +func (module *SdkLibrary) XmlPermissionsFileContent() string { + return fmt.Sprintf(permissionsTemplate, module.BaseModuleName(), module.implPath()) +} + // Creates the xml file that publicizes the runtime library func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) { + + xmlContent := module.XmlPermissionsFileContent() + + genRuleName := module.genXmlPermissionsFileName() + + // Create a genrule module to create the XML permissions file. + genRuleProps := struct { + Name *string + Cmd *string + Out []string + }{ + Name: proptools.StringPtr(genRuleName), + Cmd: proptools.StringPtr("echo -e '" + xmlContent + "' > '$(out)'"), + Out: []string{module.xmlFileName()}, + } + + mctx.CreateModule(genrule.GenRuleFactory, &genRuleProps) + // creates a prebuilt_etc module to actually place the xml file under // <partition>/etc/permissions etcProps := struct { @@ -637,7 +662,7 @@ func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) { System_ext_specific *bool }{} etcProps.Name = proptools.StringPtr(module.xmlFileName()) - etcProps.Src = proptools.StringPtr(":" + module.BaseModuleName() + "{.xml}") + etcProps.Src = proptools.StringPtr(":" + genRuleName) etcProps.Sub_dir = proptools.StringPtr("permissions") if module.SocSpecific() { etcProps.Soc_specific = proptools.BoolPtr(true) |