diff options
| author | 2019-12-20 18:20:50 +0000 | |
|---|---|---|
| committer | 2019-12-20 18:20:50 +0000 | |
| commit | dcee89cad6f0f5c9f63ba0d0cb0842a977501911 (patch) | |
| tree | 7fdef232917eb06f4589b1b96bc0b0b9e00fe279 /apex/apex_test.go | |
| parent | a0843f6a6f051617053d187fbdb217205264fb27 (diff) | |
| parent | 7abcf8ead8238a463714aa58beb521ac8f538aa1 (diff) | |
Merge "Make apex.overrides overridable by override_apex."
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 5e49e41b7..60ed801ab 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -3146,12 +3146,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 { @@ -3204,6 +3206,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") |