diff options
| author | 2017-09-06 18:34:47 +0000 | |
|---|---|---|
| committer | 2017-09-06 18:34:47 +0000 | |
| commit | a11709b1857b47a62dcc863d20f2298cdf6f85f3 (patch) | |
| tree | 6a2dc7ac6e104559846f3487726922d704fa852d | |
| parent | fb5369bc3f0f58909fac98d9d4661dbeb8241c75 (diff) | |
| parent | 5781a25fb0cf53ff55abd014b0450ea0e174bf44 (diff) | |
Merge "Fix intermittent build failures with droiddoc generated sources"
| -rw-r--r-- | test-runner/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 0752661b3a68..a642fdfb58a0 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -70,11 +70,10 @@ LOCAL_MODULE := android.test.mock.sdk LOCAL_SOURCE_FILES_ALL_GENERATED := true -include $(BUILD_STATIC_JAVA_LIBRARY) - # Make sure to run droiddoc first to generate the stub source files. -$(full_classes_compiled_jar) : $(android_test_mock_gen_stamp) -$(full_classes_jack) : $(android_test_mock_gen_stamp) +LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp) + +include $(BUILD_STATIC_JAVA_LIBRARY) # Archive a copy of the classes.jar in SDK build. $(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.jar) |