diff options
| author | Joe Onorato <> | 2009-04-16 19:15:49 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-16 19:15:49 -0700 |
| commit | f32686a3e24323f08936fe29ab3552672ac92d77 (patch) | |
| tree | 9151fcf7fdec8a2592ffce2a9351bcefa45361ca | |
| parent | a744f1b5a54bf9422ae0296e302632fcaa3e3cc5 (diff) | |
| download | build-f32686a3e24323f08936fe29ab3552672ac92d77.zip build-f32686a3e24323f08936fe29ab3552672ac92d77.tar.gz build-f32686a3e24323f08936fe29ab3552672ac92d77.tar.bz2 | |
AI 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.
BUG=1786404
Automated import of CL 146687
| -rw-r--r--[-rwxr-xr-x] | target/product/generic_with_google.mk | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | tools/check_builds.sh | 16 |
2 files changed, 24 insertions, 1 deletions
diff --git a/target/product/generic_with_google.mk b/target/product/generic_with_google.mk index af499b3..dddbbb7 100755..100644 --- 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 index 599aafa..fd380dd 100755..100644 --- a/tools/check_builds.sh +++ b/tools/check_builds.sh @@ -40,6 +40,7 @@ function do_builds 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 @@ function check_builds 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 +} + |