diff options
| author | Brett Chabot <brettchabot@android.com> | 2012-04-16 14:37:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 14:37:24 -0700 |
| commit | c24ad532414d428b65a72598b97f096b887af81f (patch) | |
| tree | 07867c3199ed7ac95c26555d8620fa4f143b74ed /tests | |
| parent | 901cb6160d694e18845be719cc3975444755ff59 (diff) | |
| parent | 8debcfa2904fd1e2fc6389bc49575f3fb2b251b3 (diff) | |
| download | frameworks_base-c24ad532414d428b65a72598b97f096b887af81f.zip frameworks_base-c24ad532414d428b65a72598b97f096b887af81f.tar.gz frameworks_base-c24ad532414d428b65a72598b97f096b887af81f.tar.bz2 | |
Merge "Build Smoke tests against the SDK."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/SmokeTest/Android.mk | 6 | ||||
| -rw-r--r-- | tests/SmokeTest/tests/Android.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/SmokeTest/Android.mk b/tests/SmokeTest/Android.mk index 0adfd4c..591a84e 100644 --- a/tests/SmokeTest/Android.mk +++ b/tests/SmokeTest/Android.mk @@ -6,11 +6,11 @@ LOCAL_MODULE_TAGS := tests # This builds "SmokeTestApp" LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner - LOCAL_PACKAGE_NAME := SmokeTestApp +LOCAL_SDK_VERSION := 8 + include $(BUILD_PACKAGE) # This builds "SmokeTest" -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/SmokeTest/tests/Android.mk b/tests/SmokeTest/tests/Android.mk index 86bf23d..18e682e 100644 --- a/tests/SmokeTest/tests/Android.mk +++ b/tests/SmokeTest/tests/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_JAVA_LIBRARIES := android.test.runner - # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) @@ -17,5 +15,7 @@ LOCAL_PACKAGE_NAME := SmokeTest LOCAL_INSTRUMENTATION_FOR := SmokeTestApp +LOCAL_SDK_VERSION := 8 + include $(BUILD_PACKAGE) |