Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 403eee71 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev-plus-aosp

parents 11f1c48a b882daa1

legacy-test/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -94,11 +94,10 @@ LOCAL_MODULE := legacy.test.stubs 


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) : $(legacy_test_api_gen_stamp)

$(full_classes_jack) : $(legacy_test_api_gen_stamp)

LOCAL_ADDITIONAL_DEPENDENCIES := $(legacy_test_api_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):legacy.test.stubs.jar)

test-runner/Android.mk

+6 −8
Original line number Diff line number Diff line
@@ -107,11 +107,10 @@ LOCAL_JAVA_LIBRARIES := \ 


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_runner_api_gen_stamp)

$(full_classes_jack) : $(android_test_runner_api_gen_stamp)

LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_runner_api_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.runner.stubs.jar)
@@ -202,11 +201,10 @@ LOCAL_MODULE := android.test.mock.stubs 


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.stubs.jar)