Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044

am: 1c091ba045

Change-Id: I1a6d1130de87ef0a69727a7c7a7950704df47c04

diff --cc packages/SettingsLib/Android.mk
index 894a1ab,37cb721..69287e8
--- 1/packages/SettingsLib/Android.mk
--- 2/packages/SettingsLib/Android.mk
+++ b/packages/SettingsLib/Android.mk
@@@ -13,14 -11,8 +13,12 @@@ LOCAL_SHARED_ANDROID_LIBRARIES := 
      android-support-v7-recyclerview \
      android-support-v7-preference \
      android-support-v7-appcompat \
 -    android-support-v14-preference
 +    android-support-v14-preference \
 +    apptoolkit-lifecycle-runtime
 +
 +LOCAL_SHARED_JAVA_LIBRARIES := \
 +    apptoolkit-lifecycle-common
  
- LOCAL_STATIC_JAVA_LIBRARY := legacy-android-test
- 
  LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
  
  LOCAL_JAR_EXCLUDE_FILES := none