From 1568978ecaa143d6a63e3fcfd31778332f25f2dc Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Thu, 7 Jul 2011 10:17:06 +0200 Subject: [PATCH] Use only present proprietary files some apk doesnt exists anymore, and HTC stuff must not be present here Also dont ignore LatinIME required to have a least one keyboard Signed-off-by: Tanguy Pruvot Change-Id: I8c5852c6038d3baec65d8f6af7caae5372770679 --- Android.mk | 2 +- products/common.mk | 66 ++++++++++++++++++---------------------------- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/Android.mk b/Android.mk index f9f2628a..f3dc3d6e 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # We need a way to prevent the stuff Google Apps replaces from being included in the build. # This is a hacky way to do that. ifdef CYANOGEN_WITH_GOOGLE - PACKAGES.Email.OVERRIDES := Provision LatinIME QuickSearchBox + PACKAGES.Email.OVERRIDES := Provision QuickSearchBox endif diff --git a/products/common.mk b/products/common.mk index ec51c125..6c6bbb66 100644 --- a/products/common.mk +++ b/products/common.mk @@ -97,47 +97,33 @@ PRODUCT_COPY_FILES += \ #ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0 ifdef CYANOGEN_WITH_GOOGLE - PRODUCT_COPY_FILES += \ - vendor/cyanogen/proprietary/CarHomeGoogle.apk:./system/app/CarHomeGoogle.apk \ - vendor/cyanogen/proprietary/CarHomeLauncher.apk:./system/app/CarHomeLauncher.apk \ - vendor/cyanogen/proprietary/Facebook.apk:./system/app/Facebook.apk \ - vendor/cyanogen/proprietary/GenieWidget.apk:./system/app/GenieWidget.apk \ - vendor/cyanogen/proprietary/Gmail.apk:./system/app/Gmail.apk \ - vendor/cyanogen/proprietary/GoogleBackupTransport.apk:./system/app/GoogleBackupTransport.apk \ - vendor/cyanogen/proprietary/GoogleCalendarSyncAdapter.apk:./system/app/GoogleCalendarSyncAdapter.apk \ - vendor/cyanogen/proprietary/GoogleContactsSyncAdapter.apk:./system/app/GoogleContactsSyncAdapter.apk \ - vendor/cyanogen/proprietary/GoogleFeedback.apk:./system/app/GoogleFeedback.apk \ - vendor/cyanogen/proprietary/GooglePartnerSetup.apk:./system/app/GooglePartnerSetup.apk \ - vendor/cyanogen/proprietary/GoogleQuickSearchBox.apk:./system/app/GoogleQuickSearchBox.apk \ - vendor/cyanogen/proprietary/GoogleServicesFramework.apk:./system/app/GoogleServicesFramework.apk \ - vendor/cyanogen/proprietary/HtcCopyright.apk:./system/app/HtcCopyright.apk \ - vendor/cyanogen/proprietary/HtcEmailPolicy.apk:./system/app/HtcEmailPolicy.apk \ - vendor/cyanogen/proprietary/HtcSettings.apk:./system/app/HtcSettings.apk \ - vendor/cyanogen/proprietary/LatinImeTutorial.apk:./system/app/LatinImeTutorial.apk \ - vendor/cyanogen/proprietary/Maps.apk:./system/app/Maps.apk \ - vendor/cyanogen/proprietary/MarketUpdater.apk:./system/app/MarketUpdater.apk \ - vendor/cyanogen/proprietary/MediaUploader.apk:./system/app/MediaUploader.apk \ - vendor/cyanogen/proprietary/NetworkLocation.apk:./system/app/NetworkLocation.apk \ - vendor/cyanogen/proprietary/OneTimeInitializer.apk:./system/app/OneTimeInitializer.apk \ - vendor/cyanogen/proprietary/PassionQuickOffice.apk:./system/app/PassionQuickOffice.apk \ - vendor/cyanogen/proprietary/SetupWizard.apk:./system/app/SetupWizard.apk \ - vendor/cyanogen/proprietary/Street.apk:./system/app/Street.apk \ - vendor/cyanogen/proprietary/Talk.apk:./system/app/Talk.apk \ - vendor/cyanogen/proprietary/Twitter.apk:./system/app/Twitter.apk \ - vendor/cyanogen/proprietary/Vending.apk:./system/app/Vending.apk \ - vendor/cyanogen/proprietary/VoiceSearch.apk:./system/app/VoiceSearch.apk \ - vendor/cyanogen/proprietary/YouTube.apk:./system/app/YouTube.apk \ - vendor/cyanogen/proprietary/googlevoice.apk:./system/app/googlevoice.apk \ - vendor/cyanogen/proprietary/kickback.apk:./system/app/kickback.apk \ - vendor/cyanogen/proprietary/soundback.apk:./system/app/soundback.apk \ - vendor/cyanogen/proprietary/talkback.apk:./system/app/talkback.apk \ - vendor/cyanogen/proprietary/com.google.android.maps.xml:./system/etc/permissions/com.google.android.maps.xml \ - vendor/cyanogen/proprietary/features.xml:./system/etc/permissions/features.xml \ - vendor/cyanogen/proprietary/com.google.android.maps.jar:./system/framework/com.google.android.maps.jar \ - vendor/cyanogen/proprietary/libspeech.so:./system/lib/libspeech.so + + # use all present proprietary apk + PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.apk && \ + find vendor/cyanogen/proprietary -name '*.apk' \ + -printf '%p:system/app/%f ') + + # use all present proprietary lib + PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.lib && \ + find vendor/cyanogen/proprietary -name '*.so' \ + -printf '%p:system/lib/%f ') + + # use all present proprietary jar + PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.jar && \ + find vendor/cyanogen/proprietary -name '*.jar' \ + -printf '%p:system/framework/%f ') + + # use all present proprietary xml (permissions) + PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.xml && \ + find vendor/cyanogen/proprietary -name '*.xml' \ + -printf '%p:system/etc/permissions/%f ') + else PRODUCT_PACKAGES += \ Provision \ - GoogleSearch \ - LatinIME + GoogleSearch endif + +# Required, keyboard +PRODUCT_PACKAGES += LatinIME +