From 5a8d1bee89af690ea9383252e7b509fa7a06665d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 25 Apr 2018 22:57:34 +0900 Subject: Add prebuilt_etc_xml prebuilt_etc_xml installs an xml file to /etc[/] and validates the xml file against the given DTD file before installing it. This change also includes some fixes for prebuilt_etc which is the super module of prebuilt_etc_xml: 1) The module is changed to arch-specific module as the prebuilts are only for devices (installed under the etc dir), but not for hosts. 2) Dependency to android.Prebuilt is removed because android.Prebuilt is intended to be used for the case when a module can exist as prebuilts, source or both. These prebuilt_etc_* modules are prebuilt only. 3) srcs property which accepts a list of source files is changed to src that only accepts single source file, which makes more sense for prebuilts. Bug: 65686190 Test: m -j (xml_test.go) Change-Id: I40484f3f6615b99f6b8d43176db0c40c5bfd838e --- java/sdk_library.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 13a9275ce..2396467f5 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -407,14 +407,14 @@ func (module *sdkLibrary) createXmlFile(mctx android.TopDownMutatorContext) { // /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) -- cgit v1.2.3-59-g8ed1b