diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-06 01:14:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-06 01:14:56 +0000 |
| commit | 8ac8d73530835196dd191607e77a7bb57b4168a1 (patch) | |
| tree | e33b0a17ca5ecdcfca57191f9d2b7a69c3e528e5 /Android.mk | |
| parent | 71170d7b160d7a08bd0a3c0a632b698555d7501c (diff) | |
| parent | 0ae3888ad1b50e1331f2785fad419288e40e7fda (diff) | |
| download | android_packages_apps_Trebuchet-8ac8d73530835196dd191607e77a7bb57b4168a1.tar.gz android_packages_apps_Trebuchet-8ac8d73530835196dd191607e77a7bb57b4168a1.tar.bz2 android_packages_apps_Trebuchet-8ac8d73530835196dd191607e77a7bb57b4168a1.zip | |
Merge "Split out launcherProtos from sysui_shared.jar" into ub-launcher3-master
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 9d6e629a0..422c6f02b 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). # @@ -162,10 +170,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 @@ -226,10 +234,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 |