Merge "Add condition check of KEEP_APEX_INHERIT" (9bfdaf1d) · Commits · e / os / android_build

core/android_soong_config_vars.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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))