From b859e355e54d8b0f7d60caed080b5ccafdb6f9a6 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Thu, 9 Apr 2015 07:17:18 +0000 Subject: [PATCH] Revert "Disable the design support library and demos" This reverts commit 97930fc88bed4240b23fdca24b7817cad888367a. Change-Id: I363014ddaa19db82f076875a36b4c3c8697eb9cb --- build/sdk.atree | 5 +++++ .../SupportDesignDemos/{Android.mk.disabled => Android.mk} | 0 2 files changed, 5 insertions(+) rename samples/SupportDesignDemos/{Android.mk.disabled => Android.mk} (100%) diff --git a/build/sdk.atree b/build/sdk.atree index 1a733f709..bfdd8fd52 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -492,6 +492,11 @@ frameworks/support/v17/leanback/res 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/SupportDesignDemos/Android.mk.disabled b/samples/SupportDesignDemos/Android.mk similarity index 100% rename from samples/SupportDesignDemos/Android.mk.disabled rename to samples/SupportDesignDemos/Android.mk