Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46cbaf24 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc am: 3e75b823...

Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc am: 3e75b823 am: 44abd26c am: 0d7864a7

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



Change-Id: I3710b89916b6e93b8ff668aa258dc2b4f0b47a99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95066488 0d7864a7
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ $(call add_json_str, PlatformSepolicyVersion, $(PLATFORM_SEPOLICY_VER
$(call add_json_str,  TotSepolicyVersion,                $(TOT_SEPOLICY_VERSION))
$(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_str,  DexpreoptGlobalConfig,             $(DEX_PREOPT_CONFIG))