commit 211273119b90b693ed8874e7c524a86caabe5ee1
author Anton Hansson <hansson@google.com> Wed Apr 11 16:56:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 11 16:56:29 2018 +0000
tree cf79b37083098e3a7ac0a69490f62b2059f7b269
parent 7c20507708df63d83af536358e20ef481b11603f
parent 567b1d864d734f0569a2893a311593c8defb0206

Merge "Update 'shrinkedAndroid' to not reference the sdk module name directly."

dx/Android.mk

diff --git a/dx/Android.mk b/dx/Android.mk
index fd564f9..c8887a2 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -61,7 +61,7 @@
 
 $(LOCAL_BUILT_MODULE): PRIVATE_PROGUARD_FLAGS:= \
   -include $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags)
-$(LOCAL_BUILT_MODULE): $(call java-lib-files,sdk_v20) \
+$(LOCAL_BUILT_MODULE): $(call java-lib-files,$(call resolve-prebuilt-sdk-module,20)) \
                        $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags)| $(PROGUARD)
 	@echo Proguard: $@
 	$(hide) $(PROGUARD) -injars "$<(**/*.class)" -outjars $@ $(PRIVATE_PROGUARD_FLAGS)