diff options
| author | 2017-09-05 22:59:27 -0700 | |
|---|---|---|
| committer | 2017-09-06 09:52:43 -0700 | |
| commit | 5781a25fb0cf53ff55abd014b0450ea0e174bf44 (patch) | |
| tree | 53b985da974acbdd623ff06affa21b5ff67cd7a1 | |
| parent | 94f1fd0da2638661d831d9034117a334a675983b (diff) | |
Fix intermittent build failures with droiddoc generated sources
Jack builds fail very rarely with missing droiddoc generated
source files. This happens because jack builds have an extra
rule that does a quick check of the sources and touches a
jack.check.timestamp file. The manual dependencies for the
generated sources didn't cover this case. If the sources are
partially generated when the jack.check.timestamp rule runs,
the rule can see partial sources and fail. The same problem
might also happen for javac builds after
https://android-review.googlesource.com/c/platform/build/+/404743
separated the source list generation rule out of the
$(full_classes_jar) rule.
Use LOCAL_ADDITIONAL_DEPENDENCIES instead, which covers these
cases and will be updated to cover future changes.
Bug: 65255877
Test: m -j ANDROID_COMPILE_WITH_JACK=true out/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/jack.check.timestamp
make sure sources are generated
Change-Id: I4466b3128eb0bba6447c24abf921a6655a3d451f
Merged-In: I4466b3128eb0bba6447c24abf921a6655a3d451f
(cherry picked from commit 85ab406eb2abd2e98fa9a67384223592692c08a9)
| -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) |