commit f120e0a62614fcabfeeb92214baadefe0e1219bc
author Hyunyoung Song <hyunyoungs@google.com> Fri Aug 31 13:57:04 2018 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Fri Aug 31 13:57:30 2018 -0700
tree d22a12aab052e54372773ae76c24663e9b4e1c1d
parent 74176d6ba78b005a00f0806fd1b8ffdfac47b7a2

Link SystemUISharedLib from source if it exists

Bug: 113683301

Test: mmma -j31 packages/apps/Launcher3
Change-Id: I93671a788a322b474fd5bd4750e188faad958060

Android.mk

diff --git a/Android.mk b/Android.mk
index f04b789..cddd53d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,7 +127,7 @@
 LOCAL_MODULE_TAGS := optional
 
 ifneq (,$(wildcard frameworks/base))
-  LOCAL_STATIC_JAVA_LIBRARIES := SysUISharedLib
+  LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib
   LOCAL_PRIVATE_PLATFORM_APIS := true
 else
   LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI
@@ -190,7 +190,7 @@
 LOCAL_MODULE_TAGS := optional
 
 ifneq (,$(wildcard frameworks/base))
-  LOCAL_STATIC_JAVA_LIBRARIES := SysUISharedLib
+  LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib
   LOCAL_PRIVATE_PLATFORM_APIS := true
 else
   LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI