| commit | 7e6cf3174281cfbeb648f6b828e7ee2fb16fd895 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Wed May 26 19:15:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 26 19:15:59 2021 +0000 |
| tree | e8de323b98b055309960374e3edcfb60629b1efd | |
| parent | d4aa519b92c3949c1e769c457a80c04660a0d3a1 [diff] | |
| parent | 8f8a1abeb76dd75ac5f749eefd31a7e0452b5b0c [diff] |
Merge "Move logic to disable flattening in unbundled app mode from Soong to make." am: 0770a175a1 am: 8f8a1abeb7 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714380 Change-Id: I7d8b1ddd5fd18468430a0b0be0686d6f365ab021
diff --git a/apex/apex.go b/apex/apex.go index b99f0cc..231eba7 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -1967,7 +1967,7 @@ a.filesInfo = filesInfo // Set suffix and primaryApexType depending on the ApexType - buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps() + buildFlattenedAsDefault := ctx.Config().FlattenApex() switch a.properties.ApexType { case imageApex: if buildFlattenedAsDefault {