auto import from //branches/cupcake/...@137197
diff --git a/tools/check_builds.sh b/tools/check_builds.sh
index 14dfec6..599aafa 100755
--- a/tools/check_builds.sh
+++ b/tools/check_builds.sh
@@ -55,13 +55,22 @@
do_builds golden "$@"
}
+function compare_builds
+{
+ local inputs=
+ while [ -n "$1" ]
+ do
+ inputs="$inputs $TEST_BUILD_DIR/golden-$1/installed-files.txt"
+ inputs="$inputs $TEST_BUILD_DIR/dist-$1/installed-files.txt"
+ shift
+ done
+ build/tools/compare_fileslist.py $inputs > $TEST_BUILD_DIR/sizes.html
+}
+
function check_builds
{
rm -rf $TEST_BUILD_DIR/dist-*
do_builds dist "$@"
- build/tools/compare_fileslist.py \
- $TEST_BUILD_DIR/golden-*/installed-files.txt \
- $TEST_BUILD_DIR/dist-*/installed-files.txt \
- > $TEST_BUILD_DIR/sizes.html
+ compare_builds "$@"
}
diff --git a/tools/droiddoc/src/Android.mk b/tools/droiddoc/src/Android.mk
index abd2581..bf404b7 100644
--- a/tools/droiddoc/src/Android.mk
+++ b/tools/droiddoc/src/Android.mk
@@ -15,8 +15,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := docs
-
LOCAL_SRC_FILES := \
AnnotationInstanceInfo.java \
AnnotationValueInfo.java \
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index eaa1176..81e233a 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -690,6 +690,7 @@
#doc-content .gsc-tabsArea {
position:relative;
+ white-space:nowrap;
}
#doc-content .gsc-tabHeader {