diff --git a/apex/apex.go b/apex/apex.go index 4debe2502..1100eeaf5 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2120,7 +2120,7 @@ func (p *Prebuilt) AndroidMkEntries() android.AndroidMkEntries { entries.SetString("LOCAL_MODULE_PATH", p.installDir.ToMakePath().String()) entries.SetString("LOCAL_MODULE_STEM", p.installFilename) entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable()) - entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", p.properties.Overrides...) + entries.AddStrings("LOCAL_OVERRIDES_MODULES", p.properties.Overrides...) }, }, } diff --git a/apex/apex_test.go b/apex/apex_test.go index 690a487ab..1aac8520b 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -2254,9 +2254,9 @@ func TestPrebuiltOverrides(t *testing.T) { p := ctx.ModuleForTests("myapex.prebuilt", "android_common").Module().(*Prebuilt) expected := []string{"myapex"} - actual := android.AndroidMkEntriesForTest(t, config, "", p).EntryMap["LOCAL_OVERRIDES_PACKAGES"] + actual := android.AndroidMkEntriesForTest(t, config, "", p).EntryMap["LOCAL_OVERRIDES_MODULES"] if !reflect.DeepEqual(actual, expected) { - t.Errorf("Incorrect LOCAL_OVERRIDES_PACKAGES value '%s', expected '%s'", actual, expected) + t.Errorf("Incorrect LOCAL_OVERRIDES_MODULES value '%s', expected '%s'", actual, expected) } }