diff options
| -rw-r--r-- | legacy-test/Android.mk | 7 | ||||
| -rw-r--r-- | test-runner/Android.mk | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index ef2950b2f026..0e6b31e6ebd9 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -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) diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 3c3718adff0e..060a51895474 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -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) |