commit b751b4ebdb04b908ca7f7305033b7145b95adfcb
author Colin Cross <ccross@android.com> Fri Mar 31 18:30:18 2017 -0700
committer Colin Cross <ccross@android.com> Tue Apr 11 17:00:11 2017 +0000
tree 25be9bbabe6262e89c677460cca5314f7a4a335e
parent 77afaf4b17d1c5f849a2f3982b5176f5fb25c143

Update location of pre-proguarded classes

In preparation for making java libraries usable as static java
libraries the classes.jar file is now the post-proguard output.
Depend on classes-pre-proguard.jar instead.

Non-static java library dependencies were using javalib.jar, which
contains classes.dex and is not what robolectric wants.  Move it
to depend on classes-pre-proguard.jar too.

Bug: 36902714
Test: m -j RunSettingsRoboTests
Change-Id: I198563e0dca7bb0177ac4942b1da1c00b26d30a2
(cherry picked from commit 20af4ed89a1b758750984b5015d7b2b82f145097)

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 \