diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-05 20:43:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-05 20:43:00 +0000 |
| commit | c63461f56bbf580a1dcf90b6664e574f7cdaa18a (patch) | |
| tree | 857e94f7cc993c88b54a1d889d9897f99cd2b2ae /tests | |
| parent | a6d4c72df9d91dd07c65ec6a078703aacb80a3f1 (diff) | |
| parent | da4fcfea631c19707131581382be5328b2148692 (diff) | |
| download | packages_apps_Trebuchet-c63461f56bbf580a1dcf90b6664e574f7cdaa18a.tar.gz packages_apps_Trebuchet-c63461f56bbf580a1dcf90b6664e574f7cdaa18a.tar.bz2 packages_apps_Trebuchet-c63461f56bbf580a1dcf90b6664e574f7cdaa18a.zip | |
Merge "Move tapl build rule to Android.bp" into ub-launcher3-master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 80b690fb8..7cba33ac3 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -14,26 +14,6 @@ # LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx-test \ - androidx.test.uiautomator_uiautomator \ - mockito-target-minus-junit4 \ - launcher-aosp-tapl - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml - -LOCAL_SDK_VERSION := 28 -LOCAL_MIN_SDK_VERSION := 21 - -LOCAL_PACKAGE_NAME := Launcher3Tests - -LOCAL_INSTRUMENTATION_FOR := Launcher3 - -include $(BUILD_PACKAGE) # # Build rule for Tapl library. @@ -50,6 +30,35 @@ LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \ ../src/com/android/launcher3/TestProtocol.java LOCAL_SDK_VERSION := current -LOCAL_MODULE := launcher-aosp-tapl +LOCAL_MODULE := ub-launcher-aosp-tapl include $(BUILD_STATIC_JAVA_LIBRARY) + +# +# Build rule for Launcher3Tests +# +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests +LOCAL_STATIC_JAVA_LIBRARIES := \ + androidx-test \ + androidx.test.uiautomator_uiautomator \ + mockito-target-minus-junit4 + +ifneq (,$(wildcard frameworks/base)) + LOCAL_PRIVATE_PLATFORM_APIS := true + LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl +else + LOCAL_SDK_VERSION := 28 + LOCAL_MIN_SDK_VERSION := 21 + LOCAL_STATIC_JAVA_LIBRARIES += ub-launcher-aosp-tapl +endif + +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml + +LOCAL_PACKAGE_NAME := Launcher3Tests + +LOCAL_INSTRUMENTATION_FOR := Launcher3 + +include $(BUILD_PACKAGE) |