diff options
author | Youngsang Cho <youngsang@google.com> | 2016-05-17 15:06:21 -0700 |
---|---|---|
committer | Youngsang Cho <youngsang@google.com> | 2016-05-17 15:15:02 -0700 |
commit | f3ddd197653e536d9d0c4b47de4fe1d6d9207fa9 (patch) | |
tree | 17b0d8e42febd19b1db1ea0a1796e087d0139541 | |
parent | 48dadb49248271b01997862e1335912a4f2e189f (diff) | |
download | TV-nougat-cts-release.tar.gz |
DO NOT MERGE Refer frameworks/support instead of prebuilts/sdk/current/supportandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-release
prebuilts/sdk/current/support are different branch by branch.
So we rather refer frameworks/support for resources.
Change-Id: I9ecf511f3210897988d459419c7af79ba64b3401
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -33,8 +33,8 @@ LOCAL_MIN_SDK_VERSION := 23 # M LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/common/res \ - $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ - $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res \ + $(TOP)/frameworks/support/v17/leanback/res \ + $(TOP)/frameworks/support/v7/recyclerview/res \ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ |