diff options
| author | Jiyong Park <jiyong@google.com> | 2019-11-14 17:17:03 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-11-16 16:18:03 +0900 |
| commit | d342b855d832c1c173640ac0912eadc2cc3de380 (patch) | |
| tree | b9568c29dc38c1513c9ce1c3b34d6c518c8097e6 | |
| parent | 65ce8c3c8db58be3926f05aeb5ed9093b7561f15 (diff) | |
| download | soong-android10-dev.tar.gz | |
Override apexes with LOCAL_OVERRIDES_MODULESandroid10-dev
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.
Merged-In: Id65743b36e0b706d6ffd8cae0597cc0a42a83fb7
(cherry picked from commit b0a012cfec69d84a26144b72a153292364476218)
Change-Id: Id65743b36e0b706d6ffd8cae0597cc0a42a83fb7
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 274bf84e6..be3e4ca28 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1418,7 +1418,7 @@ func (p *Prebuilt) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)", p.installDir.RelPathString())) fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", p.installFilename) fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE :=", !p.installable()) - fmt.Fprintln(w, "LOCAL_OVERRIDES_PACKAGES :=", strings.Join(p.properties.Overrides, " ")) + fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(p.properties.Overrides, " ")) }, }, } |