LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the redundant dependency on Support7Demos

Browse Source 
Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf
This commit is contained in:
Chris Banes
2015-04-07 19:16:35 +01:00
parent 0fc23e5f0d
commit 12edcb5d03
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/Support7Demos/Android.mk
View File

@@ -29,20 +29,17 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-mediarouter \ android-support-v7-mediarouter \
android-support-v7-palette \ android-support-v7-palette \
android-support-v7-recyclerview \ android-support-v7-recyclerview \
android-support-v7-cardview \ android-support-v7-cardview
android-support-design
LOCAL_RESOURCE_DIR = \ LOCAL_RESOURCE_DIR = \
$(LOCAL_PATH)/res \ $(LOCAL_PATH)/res \
frameworks/support/v7/appcompat/res \ frameworks/support/v7/appcompat/res \
frameworks/support/v7/gridlayout/res \ frameworks/support/v7/gridlayout/res \
frameworks/support/v7/mediarouter/res \ frameworks/support/v7/mediarouter/res \
frameworks/support/v7/cardview/res \ frameworks/support/v7/cardview/res
frameworks/support/design/res
LOCAL_AAPT_FLAGS := \ LOCAL_AAPT_FLAGS := \
--auto-add-overlay \ --auto-add-overlay \
--extra-packages android.support.v7.appcompat \ --extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.cardview \ --extra-packages android.support.v7.cardview \
--extra-packages android.support.v7.gridlayout \ --extra-packages android.support.v7.gridlayout \
--extra-packages android.support.v7.mediarouter \ --extra-packages android.support.v7.mediarouter
--extra-packages android.support.design
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

0
samples/SupportDesignDemos/Android.mk → samples/SupportDesignDemos/Android.mk.disabled
View File