Disable the design support library and demos Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
diff --git a/build/sdk.atree b/build/sdk.atree index bfdd8fd..1a733f7 100644 --- a/build/sdk.atree +++ b/build/sdk.atree
@@ -492,11 +492,6 @@ frameworks/support/v17/leanback/src/.readme extras/android/support/v17/leanback/src/.readme ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar -frameworks/support/design/AndroidManifest.xml extras/android/support/design/AndroidManifest.xml -frameworks/support/design/res extras/android/support/design/res -frameworks/support/design/src/.readme extras/android/support/design/src/.readme -${OUT_DIR}/target/common/obj/PACKAGING/android-support-design_intermediates/android-support-design.jar extras/android/support/design/libs/android-support-design.jar - ############################################################################## # Tests Component ##############################################################################
diff --git a/samples/Support7Demos/Android.mk b/samples/Support7Demos/Android.mk index e3d54d0..cd6c308 100644 --- a/samples/Support7Demos/Android.mk +++ b/samples/Support7Demos/Android.mk
@@ -29,20 +29,17 @@ 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