Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbdeda5b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Override apexes with LOCAL_OVERRIDES_MODULES"

parents 8d7ae1ae b0a012cf

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -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...)

			},

		},

	}

apex/apex_test.go

+2 −2
Original line number Diff line number Diff line
@@ -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)

	}

}