From 7abcf8ead8238a463714aa58beb521ac8f538aa1 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Thu, 19 Dec 2019 17:32:06 -0800 Subject: Make apex.overrides overridable by override_apex. Test: apex_test.go Change-Id: Id47e5e5bec45ec1ada68f9d2d806585c5141a2f9 --- apex/apex_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 0c6572bbf..7ac830858 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -3027,12 +3027,14 @@ func TestOverrideApex(t *testing.T) { name: "myapex", key: "myapex.key", apps: ["app"], + overrides: ["oldapex"], } override_apex { name: "override_myapex", base: "myapex", apps: ["override_app"], + overrides: ["unknownapex"], } apex_key { @@ -3085,6 +3087,7 @@ func TestOverrideApex(t *testing.T) { ensureContains(t, androidMk, "LOCAL_MODULE := override_app.override_myapex") ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.override_myapex") ensureContains(t, androidMk, "LOCAL_MODULE_STEM := override_myapex.apex") + ensureContains(t, androidMk, "LOCAL_OVERRIDES_MODULES := unknownapex myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := app.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := override_app.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.myapex") -- cgit v1.2.3-59-g8ed1b