From 12edcb5d03e99734b025e8b8f970cabc9b291cd3 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Tue, 7 Apr 2015 19:16:35 +0100 Subject: [PATCH] Remove the redundant dependency on Support7Demos Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf --- samples/Support7Demos/Android.mk | 9 +++------ .../{Android.mk => Android.mk.disabled} | 0 2 files changed, 3 insertions(+), 6 deletions(-) rename samples/SupportDesignDemos/{Android.mk => Android.mk.disabled} (100%) diff --git a/samples/Support7Demos/Android.mk b/samples/Support7Demos/Android.mk index e3d54d083..cd6c30806 100644 --- a/samples/Support7Demos/Android.mk +++ b/samples/Support7Demos/Android.mk @@ -29,20 +29,17 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-mediarouter \ android-support-v7-palette \ android-support-v7-recyclerview \ - android-support-v7-cardview \ - android-support-design + android-support-v7-cardview LOCAL_RESOURCE_DIR = \ $(LOCAL_PATH)/res \ frameworks/support/v7/appcompat/res \ frameworks/support/v7/gridlayout/res \ frameworks/support/v7/mediarouter/res \ - frameworks/support/v7/cardview/res \ - frameworks/support/design/res + frameworks/support/v7/cardview/res LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages android.support.v7.appcompat \ --extra-packages android.support.v7.cardview \ --extra-packages android.support.v7.gridlayout \ - --extra-packages android.support.v7.mediarouter \ - --extra-packages android.support.design + --extra-packages android.support.v7.mediarouter include $(BUILD_PACKAGE) diff --git a/samples/SupportDesignDemos/Android.mk b/samples/SupportDesignDemos/Android.mk.disabled similarity index 100% rename from samples/SupportDesignDemos/Android.mk rename to samples/SupportDesignDemos/Android.mk.disabled