From bcde95efec290ab902ef32105f6f9481b2071ae7 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Wed, 6 Mar 2019 00:44:53 +0000
Subject: [PATCH] Revert "Include Launcher3QuickstepLib for tapl"

This reverts commit 494dd8da8207448033f2dcdf1e9550ddc4cc4ef6.

Reason for revert: Breaks ub tests

Change-Id: I8f0d4a67e7a4cae21f5c9448abcc4d614f730fa4
---
 tests/Android.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 9a88785142..a787537542 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -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