diff options
| author | James Lemieux <jplemieux@google.com> | 2017-11-15 13:52:59 -0800 |
|---|---|---|
| committer | James Lemieux <jplemieux@google.com> | 2017-11-15 13:52:59 -0800 |
| commit | 5b24dd6eb2910fccccd8ab2f4734f8b6a36d11b6 (patch) | |
| tree | 5b370a8ddd0eb552eea27400c83a0510259e0e18 | |
| parent | af777b50a6b520788984df47e1c0f273a51a736e (diff) | |
| download | robolectric-shadows-5b24dd6eb2910fccccd8ab2f4734f8b6a36d11b6.tar.gz | |
Avoid compiling play services shadows
Bug: 69375909
Test: make Robolectric_all
Change-Id: I0b725edf9762b9b6ea58d81cc58d56ac53b5e6be
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | robolectric/Android.mk | 5 | ||||
| -rw-r--r-- | shadows/playservices/Android.mk | 5 | ||||
| -rw-r--r-- | src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider | 1 |
4 files changed, 2 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index 2c198c815..11ffefc40 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := Robolectric_all LOCAL_STATIC_JAVA_LIBRARIES := \ - Robolectric_shadows_playservices \ Robolectric_shadows_httpclient \ Robolectric_shadows_framework \ Robolectric_shadows_supportv4 \ diff --git a/robolectric/Android.mk b/robolectric/Android.mk index c8c357cc6..1c9a79380 100644 --- a/robolectric/Android.mk +++ b/robolectric/Android.mk @@ -51,9 +51,6 @@ LOCAL_PREBUILT_JAVA_LIBRARIES := \ robolectric-host-android_all:$(call java-lib-files, robolectric_android-all) \ robolectric-host-android-support-v4:$(call java-lib-files, android-support-v4) \ robolectric-host-android-support-multidex:$(call java-lib-files, android-support-multidex) \ - robolectric-host-org_apache_http_legacy:$(call java-lib-files, org.apache.http.legacy) \ - robolectric-host-play-services-v9-base:$(call java-lib-files, prebuilt-google-play-services-v9-base-1p) \ - robolectric-host-play-services-v9-basement:$(call java-lib-files, prebuilt-google-play-services-v9-basement-1p) \ - robolectric-host-play-services-v9-auth-base:$(call java-lib-files, prebuilt-google-play-services-v9-auth-base-1p) + robolectric-host-org_apache_http_legacy:$(call java-lib-files, org.apache.http.legacy) include $(BUILD_HOST_PREBUILT)
\ No newline at end of file diff --git a/shadows/playservices/Android.mk b/shadows/playservices/Android.mk index a0d172b10..8b38afd09 100644 --- a/shadows/playservices/Android.mk +++ b/shadows/playservices/Android.mk @@ -7,9 +7,6 @@ LOCAL_JAVA_LIBRARIES := \ Robolectric_shadows_framework \ Robolectric_annotations \ Robolectric_shadowapi \ - robolectric-host-play-services-v9-auth-base \ - robolectric-host-play-services-v9-basement \ - robolectric-host-play-services-v9-base \ robolectric-host-android-support-v4 \ robolectric-host-android_all \ robolectric-guava-20.0 @@ -26,4 +23,4 @@ LOCAL_JAVACFLAGS := -Aorg.robolectric.annotation.processing.shadowPackage=org.ro LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) -include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file +#include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file diff --git a/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider b/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider index 7404289d4..fce938c1a 100644 --- a/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider +++ b/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider @@ -1,7 +1,6 @@ # This service list is used when creating the Robolectric_all artifact. # It must be updated as new ShadowProvider implementations are added. org.robolectric.Shadows -org.robolectric.shadows.gms.Shadows org.robolectric.shadows.httpclient.Shadows org.robolectric.shadows.multidex.Shadows org.robolectric.shadows.support.v4.Shadows
\ No newline at end of file |