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

Commit b0a012cf authored by Jiyong Park's avatar Jiyong Park
Browse files

Override apexes with LOCAL_OVERRIDES_MODULES 

APEXes are ETC type, which should be overridden via
LOCAL_OVERRIDES_MODULES. This change fixes a bug that
LOCAL_OVERRIDES_PACKAGES was used for APEXes.

Bug: 140792287
Test: m
Test: add com.google.android.tzdata to PRODUCT_PACKAGES and build.
/system/apex/com.google.android.tzdata.apex exists, but
/system/apex/com.android.tzdata.apex doesn't.

Change-Id: Id65743b36e0b706d6ffd8cae0597cc0a42a83fb7
parent f9e10f94

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -2118,7 +2118,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
@@ -2251,9 +2251,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)

	}

}