Commit b7e9ac8f authored Nov 13, 2017 by Bernardo Rufino

Explicit Roboletric version for runner

* Our test target uses default roboletric target
(platform-robolectric-prebuilt), which is 3.1.1.
* Runner was updated to 3.4.2 recently (ag/3181301).
* `make RunFrameworksServicesRoboTests` broke because
org.robolectric.res.builder.DefaultPackageManager doesn't exist in new
verion (http://robolectric.org/migrating/#packagemanager-1).

Hardcoded version in our target until we migrate to new version (I tried
but there were some other errors)

Test: make RunFrameworksServicesRoboTests
Change-Id: Ie934dedec3340620611f3d72b75e5eefba430f35

parent 3ae35297

services/robotests/Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		platform-test-annotations \
		truth-prebuilt

		# TODO(b/69254249): Migrate to Robolectric 3.4.2
		LOCAL_JAVA_LIBRARIES := \
		junit \
		platform-robolectric-prebuilt
		@@ -72,4 +73,5 @@ LOCAL_TEST_PACKAGE := FrameworksServicesLib

		LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java

		include prebuilts/misc/common/robolectric/run_robotests.mk
		# TODO(b/69254249): Migrate to Robolectric 3.4.2
		include prebuilts/misc/common/robolectric/3.1.1/run_robotests.mk