Merge "Add condition check of KEEP_APEX_INHERIT" am: 9bfdaf1d55

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

Change-Id: I220573d0c9c26815d815f9ea3259150d456f4ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zhi Dou
2022-12-22 15:41:12 +00:00
committed by Automerger Merge Worker

View File

@@ -87,6 +87,10 @@ $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
# Apex build mode variables
ifdef APEX_BUILD_FOR_PRE_S_DEVICES
$(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static)
else
ifdef KEEP_APEX_INHERIT
$(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static)
endif
endif
ifeq (true,$(MODULE_BUILD_FROM_SOURCE))