diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-22 23:10:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-22 23:10:11 +0000 |
commit | 10bc3fa69d8bcce21628bb598363e5f0eb1b1757 (patch) | |
tree | a58a28229b9eb337ce08dbacd1caae6775c863e2 | |
parent | 2f15f1f3c8e2e6fd9d919518d34ba62299395fc4 (diff) | |
parent | 3ad00bf196544f686eaf8b9caf8ef44d3e991744 (diff) | |
download | build_soong-10bc3fa69d8bcce21628bb598363e5f0eb1b1757.tar.gz build_soong-10bc3fa69d8bcce21628bb598363e5f0eb1b1757.tar.bz2 build_soong-10bc3fa69d8bcce21628bb598363e5f0eb1b1757.zip |
Snap for 5681426 from 3ad00bf196544f686eaf8b9caf8ef44d3e991744 to qt-release
Change-Id: Iac634d18c29c875d9ab74a1b4ff8cb0e10acc8bc
-rw-r--r-- | android/override_module.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/android/override_module.go b/android/override_module.go index 119bca1c..ba66182e 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -90,8 +90,6 @@ type OverridableModule interface { // Base module struct for overridable module types type OverridableModuleBase struct { - ModuleBase - // List of OverrideModules that override this base module overrides []OverrideModule // Used to parallelize registerOverrideMutator executions. Note that only addOverride locks this @@ -137,7 +135,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule // Adds the base module to the overrides property, if exists, of the overriding module. See the // comment on OverridableModuleBase.overridesProperty for details. if b.overridesProperty != nil { - *b.overridesProperty = append(*b.overridesProperty, b.Name()) + *b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName()) } for _, p := range b.overridableProperties { for _, op := range o.getOverridingProperties() { |