diff options
| author | Alan Viverette <alanv@google.com> | 2018-03-02 15:08:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-02 15:08:14 +0000 |
| commit | d81330d97f64f41079c48cad5d21c95c06a8ac62 (patch) | |
| tree | 24ea010598b346ab8fd3445225cddac5d4375ab5 | |
| parent | 9c2467845b7c4dbf37f6b7828c8da4e86e6b2d34 (diff) | |
| parent | f7fc25834ef6766e1ffcecfd0a683f5902b724c8 (diff) | |
| download | TV-pie-qpr3-release.tar.gz | |
Merge "Disable Support Library dependency resolution"android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
| -rw-r--r-- | common/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/Android.mk b/common/Android.mk index 7d674a0c..a0333fc9 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -16,11 +16,13 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 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 |