AI 146824: am: CL 146738 am: CL 146687 The maps and gtalkservice libraries were still being included in
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146824
diff --git a/target/product/generic_with_google.mk b/target/product/generic_with_google.mk
old mode 100755
new mode 100644
index af499b3..dddbbb7
--- a/target/product/generic_with_google.mk
+++ b/target/product/generic_with_google.mk
@@ -5,7 +5,14 @@
PRODUCT_PACKAGES := \
GoogleContactsProvider \
- GoogleSubscribedFeedsProvider
+ GoogleSubscribedFeedsProvider \
+ com.google.android.gtalkservice \
+ com.google.android.maps
+
+PRODUCT_COPY_FILES := \
+ vendor/google/frameworks/maps/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \
+ vendor/google/apps/GTalkService/com.google.android.gtalkservice.xml:system/etc/permissions/com.google.android.gtalkservice.xml
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
diff --git a/tools/check_builds.sh b/tools/check_builds.sh
old mode 100755
new mode 100644
index 599aafa..fd380dd
--- a/tools/check_builds.sh
+++ b/tools/check_builds.sh
@@ -40,6 +40,7 @@
while [ -n "$1" ]
do
rm -rf $TEST_BUILD_DIR/$PREFIX-$1
+ make PRODUCT-$(echo $1 | sed "s/-.*//" )-installclean
make -j6 PRODUCT-$1 dist DIST_DIR=$TEST_BUILD_DIR/$PREFIX-$1
if [ $? -ne 0 ] ; then
echo FAILED
@@ -74,3 +75,18 @@
compare_builds "$@"
}
+function diff_builds
+{
+ local inputs=
+ while [ -n "$1" ]
+ do
+ diff $TEST_BUILD_DIR/golden-$1/installed-files.txt $TEST_BUILD_DIR/dist-$1/installed-files.txt &> /dev/null
+ if [ $? != 0 ]; then
+ echo =========== $1 ===========
+ diff $TEST_BUILD_DIR/golden-$1/installed-files.txt $TEST_BUILD_DIR/dist-$1/installed-files.txt
+ fi
+ shift
+ done
+ build/tools/compare_fileslist.py $inputs > $TEST_BUILD_DIR/sizes.html
+}
+
