commit 2942329a53b7fa23504d5120c9838649df3aac8b
author gitbuildkicker <android-build@google.com> Wed Apr 12 00:09:47 2017 -0700
committer gitbuildkicker <android-build@google.com> Wed Apr 12 00:09:47 2017 -0700
tree 25be9bbabe6262e89c677460cca5314f7a4a335e
parent b751b4ebdb04b908ca7f7305033b7145b95adfcb
parent 69c670418c1d284f90c2d4d289adc665feb441eb

merge in oc-release history after reset to oc-dev

common/robolectric/run_robotests.mk

diff --git a/common/robolectric/run_robotests.mk b/common/robolectric/run_robotests.mk
index 1f11ae9..be2a07c 100644
--- a/common/robolectric/run_robotests.mk
+++ b/common/robolectric/run_robotests.mk
@@ -184,14 +184,12 @@
         | $(my_test_filter_command)))
 # The source jars containing the tests.
 my_srcs_jars := \
-    $(foreach lib,$(LOCAL_JAVA_LIBRARIES), \
-        $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) \
     $(foreach lib, \
-        $(LOCAL_STATIC_JAVA_LIBRARIES), \
-        $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/classes.jar) \
+        $(LOCAL_JAVA_LIBRARIES) $(LOCAL_STATIC_JAVA_LIBRARIES), \
+        $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/classes-pre-proguard.jar) \
     $(foreach lib, \
         $(LOCAL_TEST_PACKAGE), \
-        $(call intermediates-dir-for,APPS,$(lib),,COMMON)/classes.jar)
+        $(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 \