From f1801bc0a5bfc72ea2b06697204de724b18d8548 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Wed, 13 Feb 2019 11:10:07 -0800 Subject: [PATCH] Ensure that make doesn't flatten zipapex files. Zip apex files are not really installed so should not ever be flattened. Unfortunately we didn't send this information to make which would still unzip everything. Test: ALLOW_MISSING_DEPENDENCIES=true ./art/tools/build_linux_bionic_tests.sh com.android.runtime.host Bug: 124333446 Change-Id: I3eda579f8c40f768f1ef2be867967f436396cd4c --- apex/apex.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index e7f498aa8..5e1a94344 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1029,7 +1029,7 @@ func (a *apexBundle) AndroidMk() android.AndroidMkData { }} } -func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string) []string { +func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string, apexType apexPackaging) []string { moduleNames := []string{} for _, fi := range a.filesInfo { @@ -1042,7 +1042,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string) []st fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)") fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName) - if a.flattened { + if a.flattened && apexType.image() { // /system/apex//{lib|framework|...} fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)", a.installDir.RelPathString(), name, fi.installDir)) @@ -1111,7 +1111,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { moduleNames := []string{} if a.installable() { - moduleNames = a.androidMkForFiles(w, name, moduleDir) + moduleNames = a.androidMkForFiles(w, name, moduleDir, apexType) } if a.flattened && apexType.image() {