diff options
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | tests/Android.mk | 51 |
2 files changed, 59 insertions, 21 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 000000000..ae5430785 --- /dev/null +++ b/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_library { + name: "launcher-aosp-tapl", + static_libs: [ + "androidx.annotation_annotation", + "androidx-test", + "androidx.test.uiautomator_uiautomator", + "SystemUISharedLib", + ], + srcs: [ + "tests/tapl/**/*.java", + "quickstep/src/com/android/quickstep/SwipeUpSetting.java", + "src/com/android/launcher3/TestProtocol.java", + ], + platform_apis: true, +} 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) |