Merge branch 'readonly-p4-master'
This commit is contained in:

committed by
The Android Open Source Project
commit
c09cd34bee
9
target/product/generic_with_google.mk
Executable file → Normal file
9
target/product/generic_with_google.mk
Executable file → Normal file
@@ -5,7 +5,14 @@
|
|||||||
|
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
GoogleContactsProvider \
|
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)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
|
||||||
|
|
||||||
|
16
tools/check_builds.sh
Executable file → Normal file
16
tools/check_builds.sh
Executable file → Normal file
@@ -40,6 +40,7 @@ function do_builds
|
|||||||
while [ -n "$1" ]
|
while [ -n "$1" ]
|
||||||
do
|
do
|
||||||
rm -rf $TEST_BUILD_DIR/$PREFIX-$1
|
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
|
make -j6 PRODUCT-$1 dist DIST_DIR=$TEST_BUILD_DIR/$PREFIX-$1
|
||||||
if [ $? -ne 0 ] ; then
|
if [ $? -ne 0 ] ; then
|
||||||
echo FAILED
|
echo FAILED
|
||||||
@@ -74,3 +75,18 @@ function check_builds
|
|||||||
compare_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
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user