diff options
| author | 2017-09-06 19:10:07 +0000 | |
|---|---|---|
| committer | 2017-09-06 19:10:07 +0000 | |
| commit | edc9bbc042f8393968b00fdcecfe7d3e789472cd (patch) | |
| tree | cb63aaff6f88c3fed810497a179cd2285b3c016a | |
| parent | be2efcef2072866054485939e561dde08d47c69f (diff) | |
| parent | 2011a3ac1dcc2afcd3849cf58467d029dc01cfd3 (diff) | |
Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp
| -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) |