summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJoe Onorato <>2009-04-17 11:15:32 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-17 11:15:32 -0700
commit30663a2d1a41e6359b083090ef9442af12264c17 (patch)
tree8f6da6061ffeb7f7d76f09a2c37e609ef2529194 /target
parentf481f53de2004cbe848da3fe45f132f5f233e3fa (diff)
downloadbuild-30663a2d1a41e6359b083090ef9442af12264c17.zip
build-30663a2d1a41e6359b083090ef9442af12264c17.tar.gz
build-30663a2d1a41e6359b083090ef9442af12264c17.tar.bz2
AI 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/... Automated import of CL 146738
Diffstat (limited to 'target')
-rw-r--r--[-rwxr-xr-x]target/product/generic_with_google.mk9
1 files changed, 8 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)