commit a67060571ee411d35dce266322ae71c47f1ecf02
author Yuichi Araki <yaraki@google.com> Wed Apr 15 02:58:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 02:58:29 2015 +0000
tree 87625a220f3074a83dfd9f834a6eee775ce938ff
parent edaa710ea8921d9c759957e592f7e4f0e85ac7f9
parent 405b3da398b042d450dc2e3e542eadd0a20a9b0e

Merge "Add NavigationView usage to SupportDesignDemos" into lmp-mr1-ub-dev

samples/Support7Demos/Android.mk

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)

scripts/acov

diff --git a/scripts/acov b/scripts/acov
index bf2cad4..a884ca2 100755
--- a/scripts/acov
+++ b/scripts/acov
@@ -37,8 +37,14 @@
 fi
 
 if [ "$1" = "--prep" ]; then
-  find $ANDROID_HOST_OUT -name '*.gcda' -delete
-  find $ANDROID_PRODUCT_OUT -name '*.gcda' -delete
+  if [ -d "$ANDROID_HOST_OUT" ]; then
+    find $ANDROID_HOST_OUT -name '*.gcda' -delete
+  fi
+
+  if [ -d "$ANDROID_PRODUCT_OUT" ]; then
+    find $ANDROID_PRODUCT_OUT -name '*.gcda' -delete
+  fi
+
   exit 0
 fi