Add missing dependencies for robolectric 3.6.1
When ag/3352132 altered the compile-time dependencies of 3.5.1
it failed to update the template that generates the Android.mk.
Consequently, when importing 3.6.1, it generated Android.mk
sans new dependencies.
Bug: 71596155
Test: make RunFrameworksServicesRoboTests
Change-Id: I32272bc17992dae9f4bbbf0872b4259877aba226
diff --git a/common/robolectric/3.6.1/Android.mk b/common/robolectric/3.6.1/Android.mk
index 1862a20..3abd1de 100644
--- a/common/robolectric/3.6.1/Android.mk
+++ b/common/robolectric/3.6.1/Android.mk
@@ -6,14 +6,16 @@
include $(CLEAR_VARS)
LOCAL_STATIC_JAVA_LIBRARIES := \
+ platform-robolectric-3.6.1-asm \
platform-robolectric-3.6.1-annotations \
platform-robolectric-3.6.1-junit \
- platform-robolectric-3.6.1-multidex \
platform-robolectric-3.6.1-resources \
platform-robolectric-3.6.1-sandbox \
platform-robolectric-3.6.1-shadow-api \
platform-robolectric-3.6.1-shadows-framework \
platform-robolectric-3.6.1-shadows-httpclient \
+ platform-robolectric-3.6.1-shadows-multidex \
+ platform-robolectric-3.6.1-shadows-support-v4 \
platform-robolectric-3.6.1-snapshot \
platform-robolectric-3.6.1-utils
@@ -28,15 +30,17 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ platform-robolectric-3.6.1-asm:lib/asm-6.0.jar \
platform-robolectric-3.6.1-annotations:lib/annotations-3.6.1.jar \
platform-robolectric-3.6.1-junit:lib/junit-3.6.1.jar \
platform-robolectric-3.6.1-resources:lib/resources-3.6.1.jar \
platform-robolectric-3.6.1-sandbox:lib/sandbox-3.6.1.jar \
platform-robolectric-3.6.1-shadow-api:lib/shadowapi-3.6.1.jar \
- platform-robolectric-3.6.1-snapshot:lib/robolectric-3.6.1.jar \
- platform-robolectric-3.6.1-utils:lib/utils-3.6.1.jar \
- platform-robolectric-3.6.1-multidex:lib/shadows-multidex-3.6.1.jar \
platform-robolectric-3.6.1-shadows-framework:lib/shadows-framework-3.6.1.jar \
- platform-robolectric-3.6.1-shadows-httpclient:lib/shadows-httpclient-3.6.1.jar
+ platform-robolectric-3.6.1-shadows-httpclient:lib/shadows-httpclient-3.6.1.jar \
+ platform-robolectric-3.6.1-shadows-multidex:lib/shadows-multidex-3.6.1.jar \
+ platform-robolectric-3.6.1-shadows-support-v4:lib/shadows-supportv4-3.6.1.jar \
+ platform-robolectric-3.6.1-snapshot:lib/robolectric-3.6.1.jar \
+ platform-robolectric-3.6.1-utils:lib/utils-3.6.1.jar
include $(BUILD_MULTI_PREBUILT)
diff --git a/common/robolectric/update-script/download-libs.sh b/common/robolectric/update-script/download-libs.sh
index 12b7381..8b86d51 100755
--- a/common/robolectric/update-script/download-libs.sh
+++ b/common/robolectric/update-script/download-libs.sh
@@ -62,13 +62,15 @@
LOCAL_STATIC_JAVA_LIBRARIES := \\
platform-robolectric-${roboVersion}-annotations \\
+ platform-robolectric-${roboVersion}-asm \\
platform-robolectric-${roboVersion}-junit \\
- platform-robolectric-${roboVersion}-multidex \\
platform-robolectric-${roboVersion}-resources \\
platform-robolectric-${roboVersion}-sandbox \\
platform-robolectric-${roboVersion}-shadow-api \\
platform-robolectric-${roboVersion}-shadows-framework \\
platform-robolectric-${roboVersion}-shadows-httpclient \\
+ platform-robolectric-${roboVersion}-shadows-multidex \\
+ platform-robolectric-${roboVersion}-shadows-support-v4 \\
platform-robolectric-${roboVersion}-snapshot \\
platform-robolectric-${roboVersion}-utils
@@ -84,15 +86,17 @@
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \\
platform-robolectric-${roboVersion}-annotations:lib/annotations-${roboVersion}.jar \\
+ platform-robolectric-${roboVersion}-asm:lib/asm-6.0.jar \\
platform-robolectric-${roboVersion}-junit:lib/junit-${roboVersion}.jar \\
platform-robolectric-${roboVersion}-resources:lib/resources-${roboVersion}.jar \\
platform-robolectric-${roboVersion}-sandbox:lib/sandbox-${roboVersion}.jar \\
platform-robolectric-${roboVersion}-shadow-api:lib/shadowapi-${roboVersion}.jar \\
- platform-robolectric-${roboVersion}-snapshot:lib/robolectric-${roboVersion}.jar \\
- platform-robolectric-${roboVersion}-utils:lib/utils-${roboVersion}.jar \\
- platform-robolectric-${roboVersion}-multidex:lib/shadows-multidex-${roboVersion}.jar \\
platform-robolectric-${roboVersion}-shadows-framework:lib/shadows-framework-${roboVersion}.jar \\
- platform-robolectric-${roboVersion}-shadows-httpclient:lib/shadows-httpclient-${roboVersion}.jar
+ platform-robolectric-${roboVersion}-shadows-httpclient:lib/shadows-httpclient-${roboVersion}.jar \\
+ platform-robolectric-${roboVersion}-shadows-multidex:lib/shadows-multidex-${roboVersion}.jar \\
+ platform-robolectric-${roboVersion}-shadows-support-v4:lib/shadows-supportv4-${roboVersion}.jar \\
+ platform-robolectric-${roboVersion}-snapshot:lib/robolectric-${roboVersion}.jar \\
+ platform-robolectric-${roboVersion}-utils:lib/utils-${roboVersion}.jar
include \$(BUILD_MULTI_PREBUILT)
EOF