commit cf1d88725f84aaaac1c94ac7b081c08952d794ae
author Anton Hansson <hansson@google.com> Tue May 01 10:11:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 01 10:11:08 2018 +0000
tree d3364b08936e741530d42010194fe5c2e0e93a80
parent b2b163b841fa8fb36bc34eb060f8d4d77e779a5c
parent 2100ec1a0789ca27b21ef60b432e66b37e717971

Merge "Update robolectric references to android.jar."

common/robolectric/run_robotests.mk

diff --git a/common/robolectric/run_robotests.mk b/common/robolectric/run_robotests.mk
index b5b5306..26bfe15 100644
--- a/common/robolectric/run_robotests.mk
+++ b/common/robolectric/run_robotests.mk
@@ -190,7 +190,7 @@
         $(call intermediates-dir-for,APPS,$(lib),,COMMON)/classes-pre-proguard.jar)
 # The jars needed to run the tests.
 my_jars := $(my_robolectric_jars) \
-    prebuilts/sdk/$(LOCAL_SDK_VERSION)/android.jar \
+    $(call resolve-prebuilt-sdk-jar-path,$(LOCAL_SDK_VERSION)) \
     $(my_srcs_jars)