diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2018-08-31 10:48:46 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2018-08-31 10:48:46 -0700 |
| commit | 74176d6ba78b005a00f0806fd1b8ffdfac47b7a2 (patch) | |
| tree | d09fe7f7ad2823f28d92c9d5af453e3625f420e3 /Android.mk | |
| parent | 1ccaacddc17d886f84d3ad2ca2542356f8b3c218 (diff) | |
| download | android_packages_apps_Trebuchet-74176d6ba78b005a00f0806fd1b8ffdfac47b7a2.tar.gz android_packages_apps_Trebuchet-74176d6ba78b005a00f0806fd1b8ffdfac47b7a2.tar.bz2 android_packages_apps_Trebuchet-74176d6ba78b005a00f0806fd1b8ffdfac47b7a2.zip | |
Link SysUISharedLib from source if it exists
Bug: 113128349
Test: mmma -j31 packages/apps/Launcher3
Change-Id: I4bee3d59df403db46ed848d839b09c3df4ec874b
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index ca53fa7ad..f04b789fe 100644 --- a/Android.mk +++ b/Android.mk @@ -126,7 +126,16 @@ LOCAL_USE_AAPT2 := true LOCAL_AAPT2_ONLY := true LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI +ifneq (,$(wildcard frameworks/base)) + LOCAL_STATIC_JAVA_LIBRARIES := SysUISharedLib + LOCAL_PRIVATE_PLATFORM_APIS := true +else + LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI + LOCAL_SDK_VERSION := system_current + LOCAL_MIN_SDK_VERSION := 26 +endif +LOCAL_MODULE := Launcher3QuickStepLib +LOCAL_PRIVILEGED_MODULE := true LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ @@ -137,10 +146,6 @@ LOCAL_SRC_FILES := \ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res LOCAL_PROGUARD_ENABLED := disabled -LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 26 -LOCAL_MODULE := Launcher3QuickStepLib -LOCAL_PRIVILEGED_MODULE := true LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml include $(BUILD_STATIC_JAVA_LIBRARY) @@ -155,8 +160,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3QuickStepLib LOCAL_PROGUARD_ENABLED := disabled -LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 26 +ifneq (,$(wildcard frameworks/base)) + LOCAL_PRIVATE_PLATFORM_APIS := true +else + LOCAL_SDK_VERSION := system_current + LOCAL_MIN_SDK_VERSION := 26 +endif LOCAL_PACKAGE_NAME := Launcher3QuickStep LOCAL_PRIVILEGED_MODULE := true LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 @@ -180,7 +189,14 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI +ifneq (,$(wildcard frameworks/base)) + LOCAL_STATIC_JAVA_LIBRARIES := SysUISharedLib + LOCAL_PRIVATE_PLATFORM_APIS := true +else + LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI + LOCAL_SDK_VERSION := system_current + LOCAL_MIN_SDK_VERSION := 26 +endif LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ @@ -195,8 +211,6 @@ LOCAL_RESOURCE_DIR := \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_ENABLED := full -LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 26 LOCAL_PACKAGE_NAME := Launcher3QuickStepGo LOCAL_PRIVILEGED_MODULE := true LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep |