PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing UB flavor of TAPL library" into sc-dev am: ce7084f45d am: ca486297fa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948503

Change-Id: I4355200816828684eda2a9be7401356886ea16e8
This commit is contained in:
TreeHugger Robot
2021-06-15 01:17:21 +00:00
committed by Automerger Merge Worker
parent b621f9f018 ca486297fa
commit 263bbaffa6
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Android.mk
+2 -36
View File
@@ -15,34 +15,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
#
# Build rule for Tapl library.
#
include $(CLEAR_VARS)
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.annotation_annotation \
androidx.test.runner \
androidx.test.rules \
androidx.preference_preference \
androidx.test.uiautomator_uiautomator
ifneq (,$(wildcard frameworks/base))
else
LOCAL_STATIC_JAVA_LIBRARIES += SystemUISharedLib
LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
../src/com/android/launcher3/ResourceUtils.java \
../src/com/android/launcher3/testing/TestProtocol.java
endif
LOCAL_MODULE := ub-launcher-aosp-tapl
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
LOCAL_SDK_VERSION := system_current
include $(BUILD_STATIC_JAVA_LIBRARY)
# #
# Build rule for Launcher3Tests # Build rule for Launcher3Tests
# #
@@ -56,14 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target-minus-junit4 \ mockito-target-minus-junit4 \
launcher_log_protos_lite launcher_log_protos_lite
ifneq (,$(wildcard frameworks/base)) LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl
LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl
else
LOCAL_SDK_VERSION := system_28
LOCAL_MIN_SDK_VERSION := 21
LOCAL_STATIC_JAVA_LIBRARIES += ub-launcher-aosp-tapl
endif
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \ $(call all-java-files-under, src) \