diff options
| author | 2017-06-30 16:02:09 +0100 | |
|---|---|---|
| committer | 2017-10-24 13:04:27 +0100 | |
| commit | d41d847c83c598082a6572f38d0d40f5dee427ef (patch) | |
| tree | 45ffb59d37962023aa83656383c95e342014544a | |
| parent | 584886319aca5f6a183ea368e2888418b35a6660 (diff) | |
Build stubs against SDK and clear local variables
The stubs need to be built against the current SDK where possible and
not the internal modules.
Bug: 30188076
Test: delete stub files and remake targets
Change-Id: Id724c16e56d1e8fe7f61cfafe7f11ea27e01e659
| -rw-r--r-- | legacy-test/Android.mk | 4 | ||||
| -rw-r--r-- | test-runner/Android.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 0e6b31e6ebd9..bec22c934fc6 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -93,6 +93,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := legacy.test.stubs LOCAL_SOURCE_FILES_ALL_GENERATED := true +LOCAL_SDK_VERSION := current +LOCAL_ADDITIONAL_DEPENDENCIES := $(legacy_test_api_gen_stamp) # Make sure to run droiddoc first to generate the stub source files. LOCAL_ADDITIONAL_DEPENDENCIES := $(legacy_test_api_gen_stamp) @@ -162,3 +164,5 @@ LOCAL_MODULE := legacy-performance-test-hostdex include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) endif # HOST_OS == linux + +legacy_test_api_gen_stamp := diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 060a51895474..29a95e65dbf3 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -106,9 +106,11 @@ LOCAL_JAVA_LIBRARIES := \ android.test.mock.stubs \ LOCAL_SOURCE_FILES_ALL_GENERATED := true +LOCAL_SDK_VERSION := current # Make sure to run droiddoc first to generate the stub source files. LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_runner_api_gen_stamp) +android_test_runner_api_gen_stamp := include $(BUILD_STATIC_JAVA_LIBRARY) @@ -203,6 +205,7 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true # Make sure to run droiddoc first to generate the stub source files. LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp) +android_test_mock_gen_stamp := include $(BUILD_STATIC_JAVA_LIBRARY) @@ -246,6 +249,7 @@ update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP) include $(CLEAR_VARS) LOCAL_MODULE := android.test.mock.sdk +LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := android.test.mock.stubs |