diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/java_test.go | 2 | ||||
| -rw-r--r-- | java/sdk_library.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index de514e04..ea524962 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1040,7 +1040,7 @@ func TestJavaSdkLibrary(t *testing.T) { ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkImplLibrarySuffix, "android_common") - ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "") + ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") bazJavac := ctx.ModuleForTests("baz", "android_common").Rule("javac") // tests if baz is actually linked to the stubs lib diff --git a/java/sdk_library.go b/java/sdk_library.go index 13a9275c..2396467f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -407,14 +407,14 @@ func (module *sdkLibrary) createXmlFile(mctx android.TopDownMutatorContext) { // <partition>/etc/permissions etcProps := struct { Name *string - Srcs []string + Src *string Sub_dir *string Soc_specific *bool Device_specific *bool Product_specific *bool }{} etcProps.Name = proptools.StringPtr(module.xmlFileName()) - etcProps.Srcs = []string{":" + module.xmlFileName() + "-gen"} + etcProps.Src = proptools.StringPtr(":" + module.xmlFileName() + "-gen") etcProps.Sub_dir = proptools.StringPtr("permissions") if module.SocSpecific() { etcProps.Soc_specific = proptools.BoolPtr(true) |