diff options
| author | Jooyung Han <jooyung@google.com> | 2019-07-22 15:48:36 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2019-07-22 16:15:25 +0900 |
| commit | a0171822bea3ecf558df7dec78438410f5aa1b63 (patch) | |
| tree | fe4ed91ac618294a603083e4568f30cf249c5abf /xml/xml.go | |
| parent | 2ac2befc9ae5d461fda9434c553ee911fecaa4db (diff) | |
fix: prebuilt_etc_xml
Since aosp/872653 and aosp/904233 landed, prebuilt_etc_xml has been broken.
aosp/872653: Enable arch variant properties in prebuilt_etc.
aosp/904233: Add a prebuilt module type for usr/share.
This change fixes
1) pass baseDir "etc" to initialize PrebuiltEtc struct
2) change "multlib" argument to MultilibFirst to reflect aosp/872653
Bug: 138082739
Test: m com.google.vr.platform.xml && see if it is installed in /system/etc
Change-Id: I4802107fd8ccf28a1170d7d165700c92df32e341
Diffstat (limited to 'xml/xml.go')
| -rw-r--r-- | xml/xml.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xml/xml.go b/xml/xml.go index 7c670fb8f..3a680eca3 100644 --- a/xml/xml.go +++ b/xml/xml.go @@ -71,10 +71,6 @@ func (p *prebuiltEtcXml) timestampFilePath(ctx android.ModuleContext) android.Wr return android.PathForModuleOut(ctx, p.PrebuiltEtc.SourceFilePath(ctx).Base()+"-timestamp") } -func (p *prebuiltEtcXml) DepsMutator(ctx android.BottomUpMutatorContext) { - p.PrebuiltEtc.DepsMutator(ctx) -} - func (p *prebuiltEtcXml) GenerateAndroidBuildActions(ctx android.ModuleContext) { p.PrebuiltEtc.GenerateAndroidBuildActions(ctx) @@ -125,9 +121,8 @@ func (p *prebuiltEtcXml) GenerateAndroidBuildActions(ctx android.ModuleContext) func PrebuiltEtcXmlFactory() android.Module { module := &prebuiltEtcXml{} module.AddProperties(&module.properties) - - android.InitPrebuiltEtcModule(&module.PrebuiltEtc) + android.InitPrebuiltEtcModule(&module.PrebuiltEtc, "etc") // This module is device-only - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst) return module } |