Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f am: 44abd26c56

Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: Ic74df87c2c3c6a636a464416f824fe74c4674477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2023-06-23 07:09:09 +00:00
committed by Automerger Merge Worker

View File

@@ -226,7 +226,6 @@ $(call add_json_str, PlatformSepolicyVersion, $(PLATFORM_SEPOLICY_VER
$(call add_json_str, TotSepolicyVersion, $(TOT_SEPOLICY_VERSION)) $(call add_json_str, TotSepolicyVersion, $(TOT_SEPOLICY_VERSION))
$(call add_json_list, PlatformSepolicyCompatVersions, $(PLATFORM_SEPOLICY_COMPAT_VERSIONS)) $(call add_json_list, PlatformSepolicyCompatVersions, $(PLATFORM_SEPOLICY_COMPAT_VERSIONS))
$(call add_json_bool, Flatten_apex, $(filter true,$(TARGET_FLATTEN_APEX)))
$(call add_json_bool, ForceApexSymlinkOptimization, $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION))) $(call add_json_bool, ForceApexSymlinkOptimization, $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION)))
$(call add_json_str, DexpreoptGlobalConfig, $(DEX_PREOPT_CONFIG)) $(call add_json_str, DexpreoptGlobalConfig, $(DEX_PREOPT_CONFIG))