diff options
| author | Colin Cross <ccross@android.com> | 2019-04-02 23:04:13 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-08 15:56:32 +0000 |
| commit | 87224a8f7966767c728376b56284e012ee2b3980 (patch) | |
| tree | 6f360163b095aa6202da09e0cf21979bd63588db /robolectric | |
| parent | 1503523a0d9f04ad5d300136016582a2c61bbe10 (diff) | |
| download | robolectric-shadows-87224a8f7966767c728376b56284e012ee2b3980.tar.gz | |
Convert robolectric_android-all-stub to Android.bp
See build/soong/README.md for more information.
The result should be the same as when it was generated by make,
except that build.prop is now custom generated by
soong/robolectric.go instead of using the one generated for the
system image.
Test: m checkbuild
Test: m RunSettingsRoboTests
Bug: 122331577
Change-Id: I3147efcb952b010e629fbf8075ff55a7d49a2462
Merged-In: I3147efcb952b010e629fbf8075ff55a7d49a2462
(cherry picked from commit c3d581068f9faa1898a432e32c7ed4f760237abd)
Diffstat (limited to 'robolectric')
| -rw-r--r-- | robolectric/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/robolectric/Android.mk b/robolectric/Android.mk index 9e5500914..5687ec0bc 100644 --- a/robolectric/Android.mk +++ b/robolectric/Android.mk @@ -132,7 +132,7 @@ include external/robolectric-shadows/run_robolectric_module_tests.mk # HACK: specify these *TARGET* jars needed to compile robolectric as though they are prebuilt *HOST* java libraries ########################################### robolectric_target_to_host_jars := \ - robolectric-host-android_all:$(call intermediates-dir-for, JAVA_LIBRARIES, robolectric_android-all-stub,,COMMON)/classes-with-res.jar \ + robolectric-host-android_all:$(call intermediates-dir-for, JAVA_LIBRARIES, robolectric_android-all-stub,,COMMON)/classes.jar \ robolectric-host-androidx-test-core:$(call java-lib-files, androidx.test.core) \ robolectric-host-androidx-test-ext-junit:$(call java-lib-files, androidx.test.ext.junit) \ robolectric-host-androidx-test-monitor:$(call java-lib-files, androidx.test.monitor) \ |