commit 474df059db94fac9a279e5f90ab0c046de4a3e08
author KOUSHIK PANUGANTI <kpanuganti@google.com> Mon Apr 23 17:31:10 2018 -0700
committer Colin Cross <ccross@android.com> Mon Aug 27 23:31:38 2018 -0700
tree ad5028a3208f40ddfb2e327abc06540caad59238
parent d366771e84f584330c21b6381c902518af110034

Migrated various apps under frameworks/base/packages/Shell  to androidx

Bug: 76692459
Test: make Shell
Change-Id: If11159cac1bd5aa61c46a346647b97a661abbf11
Merged-In: If11159cac1bd5aa61c46a346647b97a661abbf11
(cherry picked from commit e92135a6e9e3bae6236063d35670f3f7f2f51be4)

packages/Shell/Android.mk

diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk
index 5713dc6..b738d77 100644
--- a/packages/Shell/Android.mk
+++ b/packages/Shell/Android.mk
@@ -12,7 +12,8 @@
 
 LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Shell
 LOCAL_PRIVATE_PLATFORM_APIS := true