commit 12a37963acaee1569836ef08547e1163a61aa329
author Aurimas Liutikas <aurimas@google.com> Tue Nov 14 01:41:39 2017 +0000
committer Aurimas Liutikas <aurimas@google.com> Tue Nov 14 11:28:21 2017 -0800
tree 22ac64e6aacf3c5aee3580040c21ad73e4f1fde6
parent 33d0a050018d97fc13ae559908bda3ae976ea29a

Fix import of android-support-annotations

Bug: 69161825
Change-Id: I647516330d9990869f78084e2d393742000e836b

packages/SettingsLib/Android.mk

diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk
index 1ad4fea..70c8fb3 100644
--- a/packages/SettingsLib/Android.mk
+++ b/packages/SettingsLib/Android.mk
@@ -5,8 +5,10 @@
 
 LOCAL_MODULE := SettingsLib
 
+LOCAL_JAVA_LIBRARIES := \
+    android-support-annotations
+
 LOCAL_SHARED_ANDROID_LIBRARIES := \
-    android-support-annotations \
     android-support-v4 \
     android-support-v7-recyclerview \
     android-support-v7-preference \

packages/SettingsLib/common.mk

diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index 46b66c4..b9abde2 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -14,8 +14,10 @@
 #
 
 ifeq ($(LOCAL_USE_AAPT2),true)
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES += \
-    android-support-annotations \
     android-support-v4 \
     SettingsLib
 else