Merge "Revert "Include Launcher3QuickstepLib for tapl"" into ub-launcher3-master (6f740835) · Commits · e / os / android_packages_apps_Trebuchet

tests/Android.mk

+7 −5

Original line number	Diff line number	Diff line
		@@ -24,12 +24,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		androidx.test.runner \
		androidx.test.rules \
		androidx.test.uiautomator_uiautomator \
		libSharedSystemUI \
		Launcher3QuickStepLib \
		libSharedSystemUI

		LOCAL_SRC_FILES := $(call all-java-files-under, tapl)
		LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
		../quickstep/src/com/android/quickstep/SwipeUpSetting.java \
		../src/com/android/launcher3/util/SecureSettingsObserver.java \
		../src/com/android/launcher3/TestProtocol.java \

		LOCAL_SDK_VERSION := system_current
		LOCAL_SDK_VERSION := current
		LOCAL_MODULE := ub-launcher-aosp-tapl

		include $(BUILD_STATIC_JAVA_LIBRARY)
		@@ -50,7 +52,7 @@ ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl
		else
		LOCAL_SDK_VERSION := system_current
		LOCAL_SDK_VERSION := 28
		LOCAL_MIN_SDK_VERSION := 21
		LOCAL_STATIC_JAVA_LIBRARIES += ub-launcher-aosp-tapl
		endif