commit e0c5e443605e88b1323c54bc8c123646f8a284d0
author Colin Cross <ccross@android.com> Tue Apr 07 16:50:32 2020 +0000
committer Colin Cross <ccross@android.com> Tue Apr 07 16:50:32 2020 +0000
tree 64121e5a0faf1c33e0c3fe4af5d0694d78b63904
parent 79e5a5512250eb797e99a56ae098afafd64d1467

Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."

Revert^2 "Add sdk mutator for native modules"

f8e80229fedb47302e9cfd32990859a6308020cf

Change-Id: Ib686b52339ae5031434a2fb6a0e7f5b0c0dc5641

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 3499da9..1ee6610 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3321,3 +3321,9 @@
   XZ="$(XZ)" \
   $(LIBRARY_IDENTITY_CHECK_SCRIPT) $(SOONG_STRIP_PATH) $(1) $(2)
 endef
+
+# Convert Soong libraries that have SDK variant
+define use_soong_sdk_libraries
+  $(foreach l,$(1),$(if $(filter $(l),$(SOONG_SDK_VARIANT_MODULES)),\
+      $(l).sdk,$(l)))
+endef