Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix intermittent build failures with droiddoc generated sources"

Browse Source
This commit is contained in:
Colin Cross
2017-09-06 18:34:47 +00:00
committed by Gerrit Code Review
parent fb5369bc3f 5781a25fb0
commit a11709b185
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test-runner/Android.mk
View File

@@ -70,11 +70,10 @@ LOCAL_MODULE := android.test.mock.sdk
LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_SOURCE_FILES_ALL_GENERATED := true
include $(BUILD_STATIC_JAVA_LIBRARY)
# Make sure to run droiddoc first to generate the stub source files. # Make sure to run droiddoc first to generate the stub source files.
$(full_classes_compiled_jar) : $(android_test_mock_gen_stamp) LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)
$(full_classes_jack) : $(android_test_mock_gen_stamp)
include $(BUILD_STATIC_JAVA_LIBRARY)
# Archive a copy of the classes.jar in SDK build. # Archive a copy of the classes.jar in SDK build.
$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.jar) $(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.jar)