diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-22 23:25:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-22 23:25:36 +0000 |
| commit | 00457f7e0b00f832277ee5aa9d8c022b95f9dabd (patch) | |
| tree | 35e968b5f7e4da0d9d397191607c25baed66f1f7 | |
| parent | baab1c7c2e711dd2f438ece799f2be24b557d9d1 (diff) | |
| parent | 22428d40225f55d9ac9c968fc2044a88db277251 (diff) | |
| download | build_soong-00457f7e0b00f832277ee5aa9d8c022b95f9dabd.tar.gz build_soong-00457f7e0b00f832277ee5aa9d8c022b95f9dabd.tar.bz2 build_soong-00457f7e0b00f832277ee5aa9d8c022b95f9dabd.zip | |
Snap for 5681502 from 22428d40225f55d9ac9c968fc2044a88db277251 to qt-qpr1-release
Change-Id: I4f4c4fe6fc3a261e3c834d84652484a3d84d7789
| -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() { |