commit d81330d97f64f41079c48cad5d21c95c06a8ac62
author Alan Viverette <alanv@google.com> Fri Mar 02 15:08:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 02 15:08:14 2018 +0000
tree 24ea010598b346ab8fd3445225cddac5d4375ab5
parent 9c2467845b7c4dbf37f6b7828c8da4e86e6b2d34
parent f7fc25834ef6766e1ffcecfd0a683f5902b724c8

Merge "Disable Support Library dependency resolution"

common/Android.mk

diff --git a/common/Android.mk b/common/Android.mk
index 7d674a0..a0333fc 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -16,11 +16,13 @@
 LOCAL_JAVA_LIBRARIES := \
     android-support-annotations
 
+LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES := true
+
 LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-compat \
     android-support-core-ui \
     android-support-v7-recyclerview \
-    android-support-v17-leanback \
+    android-support-v17-leanback
 
 include $(LOCAL_PATH)/buildconfig.mk