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

Commit d41d847c authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 58488631

legacy-test/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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 :=

test-runner/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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