summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2018-11-05 14:45:19 -0800
committerHyunyoung Song <hyunyoungs@google.com>2018-11-05 17:01:54 -0800
commit0ae3888ad1b50e1331f2785fad419288e40e7fda (patch)
treec4249c8c5bb55a33322f6f5c64281f35070bb339 /Android.mk
parentfc007479090e3a64d6e24534605fe08e7dc5bc96 (diff)
downloadandroid_packages_apps_Trebuchet-0ae3888ad1b50e1331f2785fad419288e40e7fda.tar.gz
android_packages_apps_Trebuchet-0ae3888ad1b50e1331f2785fad419288e40e7fda.tar.bz2
android_packages_apps_Trebuchet-0ae3888ad1b50e1331f2785fad419288e40e7fda.zip
Split out launcherProtos from sysui_shared.jar
Bug: 113043444 Change-Id: I3115cdc7871b0f77601e399df01cdde0dde87c6e
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index fbe19b0b6..ca1bfdeb5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,14 @@ LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_SDK_VERSION := current
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libLauncherProtos
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_SRC_FILES := libs/launcher_protos.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := current
+include $(BUILD_PREBUILT)
#
# Build rule for plugin lib (needed to write a plugin).
#
@@ -160,10 +168,10 @@ LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional
ifneq (,$(wildcard frameworks/base))
- LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib
+ LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
LOCAL_PRIVATE_PLATFORM_APIS := true
else
- LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI
+ LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26
endif
@@ -223,10 +231,10 @@ LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
ifneq (,$(wildcard frameworks/base))
- LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib
+ LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
LOCAL_PRIVATE_PLATFORM_APIS := true
else
- LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI
+ LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26
endif