commit 9efe534ef15b7e55facba2f6eb6b0123f58e0482
author Jooyung Han <jooyung@google.com> Thu Dec 05 16:14:18 2019 +0900
committer Jooyung Han <jooyung@google.com> Thu Dec 12 02:04:43 2019 +0900
tree 457fd24ceda18c27ab6d8b469e4322885088dd86
parent 3b500a7ec3c48fd226d5963a4d42f2401ae19b89

Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES

For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 7ce59f1..85e7bbc 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -199,6 +199,8 @@
 
 $(call add_json_bool, EnforceProductPartitionInterface,  $(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE))
 
+$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))