commit 9bfdaf1d55262a7d2715202606c2bf7cfc524eac
author Zhi Dou <zhidou@google.com> Thu Dec 22 14:59:33 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 22 14:59:33 2022 +0000
tree 8da8a6ee1748a7b00bdd94eecc106ef0275105d4
parent cef5fbb2e93282414ac9f4e278fcf8f70b27b7c2
parent 46ea5dc99a22c71d33ce61a72eaf9a78281d2767

Merge "Add condition check of KEEP_APEX_INHERIT"

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 0cd73ae..bf113ee 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -87,6 +87,10 @@
 # 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))