remove gapps, reorganize

AOKP · Feb 16, 2012 · 0c2fe17 · 0c2fe17
1 parent 797dba1
commit 0c2fe17
Show file tree

Hide file tree

Showing 99 changed files with 13 additions and 289 deletions.
diff --git a/products/common.mk b/products/common.mk
@@ -2,7 +2,6 @@
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/common
 
 PRODUCT_PACKAGES += \
-    Camera \
     MusicFX \
     MusicVisualization \
     NoiseField \
@@ -24,10 +23,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Blobs common to all devices
 PRODUCT_COPY_FILES += \
-    vendor/aokp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip \
     vendor/aokp/prebuilt/common/app/Superuser.apk:system/app/Superuser.apk \
-    vendor/aokp/prebuilt/common/app/Superuser.apk:system/app/LatinImeDictionaryPack.apk \
-    vendor/aokp/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf 
+    vendor/aokp/prebuilt/common/app/LatinImeDictionaryPack.apk:system/app/LatinImeDictionaryPack.apk \
+    vendor/aokp/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf  \
+	vendor/aokp/prebuilt/common/app/Microbes.apk:system/app/Microbes.apk \
+    vendor/aokp/prebuilt/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so
 
 # init.d
 PRODUCT_COPY_FILES += \

diff --git a/products/common_drm.mk b/products/common_drm.mk
diff --git a/products/common_gapps.mk b/products/common_gapps.mk
diff --git a/products/crespo.mk b/products/crespo.mk
@@ -21,19 +21,8 @@ PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=soju BUILD_ID=IML74K BUILD_FINGERPR
 
 # Copy crespo specific prebuilt files
 PRODUCT_COPY_FILES +=  \
-    vendor/aokp/proprietary/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
-    vendor/aokp/proprietary/crespo/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/aokp/proprietary/crespo/media/LMprec_508.emd:system/media/LMprec_508.emd \
-    vendor/aokp/proprietary/crespo/media/PFFprec_600.emd:system/media/PFFprec_600.emd \
-    vendor/aokp/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
-    vendor/aokp/proprietary/common/app/Microbes.apk:system/app/Microbes.apk \
-    vendor/aokp/proprietary/common/etc/permissions/com.google.android.media.effects.xml:system/etc/permissions/com.google.android.media.effects.xml \
-    vendor/aokp/proprietary/common/framework/com.google.android.media.effects.jar:system/framework/com.google.android.media.effects.jar \
-    vendor/aokp/proprietary/common/lib/libearthmobile.so:system/lib/libearthmobile.so \
-    vendor/aokp/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so \
-    vendor/aokp/proprietary/common/lib/libshopperimageutils-3.so:system/lib/libshopperimageutils-3.so \
-    vendor/aokp/proprietary/common/lib/libshoppervorbisencoder-2.so:system/lib/libshoppervorbisencoder-2.so \
-    vendor/aokp/proprietary/common/lib/libshopperzxingutils-4.so:system/lib/libshopperzxingutils-4.so
+    vendor/aokp/prebuilt/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
+    vendor/aokp/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
 
 # Inherit Face lock security blobs
 #-include vendor/aokp/products/common_facelock.mk

diff --git a/products/crespo4g.mk b/products/crespo4g.mk
@@ -21,19 +21,9 @@ PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=sojus BUILD_ID=GWK74 BUILD_FINGERPR
 
 # Copy crespo4g specific prebuilt files
 PRODUCT_COPY_FILES +=  \
-    vendor/aokp/proprietary/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
-    vendor/aokp/proprietary/crespo/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/aokp/proprietary/crespo/media/LMprec_508.emd:system/media/LMprec_508.emd \
-    vendor/aokp/proprietary/crespo/media/PFFprec_600.emd:system/media/PFFprec_600.emd \
-    vendor/aokp/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
-    vendor/aokp/proprietary/common/app/Microbes.apk:system/app/Microbes.apk \
-    vendor/aokp/proprietary/common/etc/permissions/com.google.android.media.effects.xml:system/etc/permissions/com.google.android.media.effects.xml \
-    vendor/aokp/proprietary/common/framework/com.google.android.media.effects.jar:system/framework/com.google.android.media.effects.jar \
-    vendor/aokp/proprietary/common/lib/libearthmobile.so:system/lib/libearthmobile.so \
-    vendor/aokp/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so \
-    vendor/aokp/proprietary/common/lib/libshopperimageutils-3.so:system/lib/libshopperimageutils-3.so \
-    vendor/aokp/proprietary/common/lib/libshoppervorbisencoder-2.so:system/lib/libshoppervorbisencoder-2.so \
-    vendor/aokp/proprietary/common/lib/libshopperzxingutils-4.so:system/lib/libshopperzxingutils-4.so
+    vendor/aokp/prebuilt/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
+    vendor/aokp/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+
 
 # Inherit Face lock security blobs
 #-include vendor/aokp/products/common_facelock.mk

diff --git a/products/maguro.mk b/products/maguro.mk
@@ -22,19 +22,6 @@ PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=yakju BUILD_ID=ITL41F BUILD_FINGERP
 
 # Copy maguro specific prebuilt files
 PRODUCT_COPY_FILES +=  \
-    vendor/aokp/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
-    vendor/aokp/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/aokp/proprietary/tuna/media/LMprec_508.emd:system/media/LMprec_508.emd \
-    vendor/aokp/proprietary/tuna/media/PFFprec_600.emd:system/media/PFFprec_600.emd \
-    vendor/aokp/proprietary/common/app/Microbes.apk:system/app/Microbes.apk \
-    vendor/aokp/proprietary/common/etc/permissions/com.google.android.media.effects.xml:system/etc/permissions/com.google.android.media.effects.xml \
-    vendor/aokp/proprietary/common/framework/com.google.android.media.effects.jar:system/framework/com.google.android.media.effects.jar \
-    vendor/aokp/proprietary/common/lib/libearthmobile.so:system/lib/libearthmobile.so \
-    vendor/aokp/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so
-
-# Inherit Face lock security blobs
-#-include vendor/aokp/products/common_facelock.mk
-
-# Inherit drm blobs
--include vendor/aokp/products/common_drm.mk
+    vendor/aokp/prebuilt/tuna/Thinkfree.apk:system/app/Thinkfree.apk \
+    vendor/aokp/prebuilt/xhdpi/bootanimation.zip:system/media/bootanimation.zip
 
diff --git a/products/toro.mk b/products/toro.mk
@@ -22,15 +22,8 @@ PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=mysid BUILD_ID=ICL53F BUILD_FINGERP
 
 # Copy toro specific prebuilt files
 PRODUCT_COPY_FILES +=  \
-    vendor/aokp/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
-    vendor/aokp/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/aokp/proprietary/tuna/media/LMprec_508.emd:system/media/LMprec_508.emd \
-    vendor/aokp/proprietary/tuna/media/PFFprec_600.emd:system/media/PFFprec_600.emd \
-    vendor/aokp/proprietary/common/app/Microbes.apk:system/app/Microbes.apk \
-    vendor/aokp/proprietary/common/etc/permissions/com.google.android.media.effects.xml:system/etc/permissions/com.google.android.media.effects.xml \
-    vendor/aokp/proprietary/common/framework/com.google.android.media.effects.jar:system/framework/com.google.android.media.effects.jar \
-    vendor/aokp/proprietary/common/lib/libearthmobile.so:system/lib/libearthmobile.so \
-    vendor/aokp/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so
+    vendor/aokp/prebuilt/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
+    vendor/aokp/prebuilt/xhdpi/bootanimation.zip:system/media/bootanimation.zip
 
 # Inherit Face lock security blobs
 #-include vendor/aokp/products/common_facelock.mk

diff --git a/proprietary/common/app/BooksTablet.apk b/proprietary/common/app/BooksTablet.apk
diff --git a/proprietary/common/app/Calendar.apk b/proprietary/common/app/Calendar.apk
diff --git a/proprietary/common/app/CarHome.apk b/proprietary/common/app/CarHome.apk
diff --git a/proprietary/common/app/ChromeBookmarksSyncAdapter.apk b/proprietary/common/app/ChromeBookmarksSyncAdapter.apk
diff --git a/proprietary/common/app/FaceLock.apk b/proprietary/common/app/FaceLock.apk
diff --git a/proprietary/common/app/Gallery2.apk b/proprietary/common/app/Gallery2.apk
diff --git a/proprietary/common/app/GenieWidget.apk b/proprietary/common/app/GenieWidget.apk
diff --git a/proprietary/common/app/Gmail.apk b/proprietary/common/app/Gmail.apk
diff --git a/proprietary/common/app/GoogleBackupTransport.apk b/proprietary/common/app/GoogleBackupTransport.apk
diff --git a/proprietary/common/app/GoogleContactsSyncAdapter.apk b/proprietary/common/app/GoogleContactsSyncAdapter.apk
diff --git a/proprietary/common/app/GoogleEarth.apk b/proprietary/common/app/GoogleEarth.apk
diff --git a/proprietary/common/app/GoogleFeedback.apk b/proprietary/common/app/GoogleFeedback.apk
diff --git a/proprietary/common/app/GoogleLoginService.apk b/proprietary/common/app/GoogleLoginService.apk
diff --git a/proprietary/common/app/GooglePartnerSetup.apk b/proprietary/common/app/GooglePartnerSetup.apk
diff --git a/proprietary/common/app/GoogleServicesFramework.apk b/proprietary/common/app/GoogleServicesFramework.apk
diff --git a/proprietary/common/app/GoogleTTS.apk b/proprietary/common/app/GoogleTTS.apk
diff --git a/proprietary/common/app/LatinIMEDictionaryPack.apk b/proprietary/common/app/LatinIMEDictionaryPack.apk
diff --git a/proprietary/common/app/Maps.apk b/proprietary/common/app/Maps.apk
diff --git a/proprietary/common/app/MarketUpdater.apk b/proprietary/common/app/MarketUpdater.apk
diff --git a/proprietary/common/app/MediaUploader.apk b/proprietary/common/app/MediaUploader.apk
diff --git a/proprietary/common/app/Microbes.apk b/proprietary/common/app/Microbes.apk
diff --git a/proprietary/common/app/Music.apk b/proprietary/common/app/Music.apk
diff --git a/proprietary/common/app/NetworkLocation.apk b/proprietary/common/app/NetworkLocation.apk
diff --git a/proprietary/common/app/OneTimeInitializer.apk b/proprietary/common/app/OneTimeInitializer.apk
diff --git a/proprietary/common/app/Phonesky.apk b/proprietary/common/app/Phonesky.apk
diff --git a/proprietary/common/app/PlusOne.apk b/proprietary/common/app/PlusOne.apk
diff --git a/proprietary/common/app/QuickSearchBox.apk b/proprietary/common/app/QuickSearchBox.apk
diff --git a/proprietary/common/app/SetupWizard.apk b/proprietary/common/app/SetupWizard.apk
diff --git a/proprietary/common/app/Street.apk b/proprietary/common/app/Street.apk
diff --git a/proprietary/common/app/Superuser.apk b/proprietary/common/app/Superuser.apk
diff --git a/proprietary/common/app/Tag.apk b/proprietary/common/app/Tag.apk
diff --git a/proprietary/common/app/Talk.apk b/proprietary/common/app/Talk.apk
diff --git a/proprietary/common/app/Videos.apk b/proprietary/common/app/Videos.apk
diff --git a/proprietary/common/app/VoiceSearch.apk b/proprietary/common/app/VoiceSearch.apk
diff --git a/proprietary/common/app/Wallet.apk b/proprietary/common/app/Wallet.apk
diff --git a/proprietary/common/app/YouTube.apk b/proprietary/common/app/YouTube.apk
diff --git a/proprietary/common/app/talkback.apk b/proprietary/common/app/talkback.apk
diff --git a/proprietary/common/etc/contributors.css b/proprietary/common/etc/contributors.css
diff --git a/proprietary/common/etc/permissions/com.google.android.maps.xml b/proprietary/common/etc/permissions/com.google.android.maps.xml
diff --git a/proprietary/common/etc/permissions/com.google.android.media.effects.xml b/proprietary/common/etc/permissions/com.google.android.media.effects.xml
diff --git a/proprietary/common/etc/permissions/com.google.android.nfc_extras.xml b/proprietary/common/etc/permissions/com.google.android.nfc_extras.xml
diff --git a/proprietary/common/etc/permissions/com.google.widevine.software.drm.xml b/proprietary/common/etc/permissions/com.google.widevine.software.drm.xml
diff --git a/proprietary/common/etc/permissions/features.xml b/proprietary/common/etc/permissions/features.xml
diff --git a/proprietary/common/etc/resolv.conf b/proprietary/common/etc/resolv.conf
diff --git a/proprietary/common/etc/updatecmds/google_generic_update.txt b/proprietary/common/etc/updatecmds/google_generic_update.txt
diff --git a/proprietary/common/framework/com.android.nfc_extras.jar b/proprietary/common/framework/com.android.nfc_extras.jar
diff --git a/proprietary/common/framework/com.google.android.maps.jar b/proprietary/common/framework/com.google.android.maps.jar
diff --git a/proprietary/common/framework/com.google.android.media.effects.jar b/proprietary/common/framework/com.google.android.media.effects.jar
diff --git a/proprietary/common/framework/com.google.widevine.software.drm.jar b/proprietary/common/framework/com.google.widevine.software.drm.jar
diff --git a/proprietary/common/lib/libWVphoneAPI.so b/proprietary/common/lib/libWVphoneAPI.so
diff --git a/proprietary/common/lib/libearthmobile.so b/proprietary/common/lib/libearthmobile.so
diff --git a/proprietary/common/lib/libfacelock_jni.so b/proprietary/common/lib/libfacelock_jni.so
diff --git a/proprietary/common/lib/libfilterpack_facedetect.so b/proprietary/common/lib/libfilterpack_facedetect.so
diff --git a/proprietary/common/lib/libflint_engine_jni_api.so b/proprietary/common/lib/libflint_engine_jni_api.so
diff --git a/proprietary/common/lib/libfrsdk.so b/proprietary/common/lib/libfrsdk.so
diff --git a/proprietary/common/lib/libgcomm_jni.so b/proprietary/common/lib/libgcomm_jni.so
diff --git a/proprietary/common/lib/libmicrobes_jni.so b/proprietary/common/lib/libmicrobes_jni.so
diff --git a/proprietary/common/lib/libpicowrapper.so b/proprietary/common/lib/libpicowrapper.so
diff --git a/proprietary/common/lib/libshopperimageutils-3.so b/proprietary/common/lib/libshopperimageutils-3.so
diff --git a/proprietary/common/lib/libshoppervorbisencoder-2.so b/proprietary/common/lib/libshoppervorbisencoder-2.so
diff --git a/proprietary/common/lib/libshopperzxingutils-4.so b/proprietary/common/lib/libshopperzxingutils-4.so
diff --git a/proprietary/common/lib/libspeexwrapper.so b/proprietary/common/lib/libspeexwrapper.so
diff --git a/proprietary/common/lib/libvideochat_jni.so b/proprietary/common/lib/libvideochat_jni.so
diff --git a/proprietary/common/lib/libvideochat_stabilize.so b/proprietary/common/lib/libvideochat_stabilize.so
diff --git a/proprietary/common/lib/libvoicesearch.so b/proprietary/common/lib/libvoicesearch.so
diff --git a/proprietary/common/vendor/lib/drm/libdrmwvmplugin.so b/proprietary/common/vendor/lib/drm/libdrmwvmplugin.so
diff --git a/proprietary/common/vendor/lib/libWVStreamControlAPI_L3.so b/proprietary/common/vendor/lib/libWVStreamControlAPI_L3.so
diff --git a/proprietary/common/vendor/lib/libwvdrm_L3.so b/proprietary/common/vendor/lib/libwvdrm_L3.so
diff --git a/proprietary/common/vendor/lib/libwvm.so b/proprietary/common/vendor/lib/libwvm.so
diff --git a/...ulti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin b/...ulti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
diff --git a/...lti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin b/...lti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
diff --git a/...lti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin b/...lti_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
diff --git a/...lti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin b/...lti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
diff --git a/...ti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin b/...ti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
diff --git a/...ti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin b/...ti_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
diff --git a/...lti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin b/...lti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
diff --git a/...ti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin b/...ti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
diff --git a/...ti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin b/...ti_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
diff --git a/...models/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-r0-ri30.4a/full_model.bin b/...models/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-r0-ri30.4a/full_model.bin
diff --git a/...odels/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rn30-ri30.5/full_model.bin b/...odels/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rn30-ri30.5/full_model.bin
diff --git a/...odels/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rp30-ri30.5/full_model.bin b/...odels/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rp30-ri30.5/full_model.bin
diff --git a/proprietary/common/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N/full_model.bin b/proprietary/common/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N/full_model.bin
diff --git a/proprietary/common/xbin/su b/proprietary/common/xbin/su
diff --git a/proprietary/crespo/app/Thinkfree.apk b/proprietary/crespo/app/Thinkfree.apk
diff --git a/proprietary/crespo/media/LMprec_508.emd b/proprietary/crespo/media/LMprec_508.emd
diff --git a/proprietary/crespo/media/PFFprec_600.emd b/proprietary/crespo/media/PFFprec_600.emd
diff --git a/proprietary/crespo/media/bootanimation.zip b/proprietary/crespo/media/bootanimation.zip
diff --git a/proprietary/tuna/app/Thinkfree.apk b/proprietary/tuna/app/Thinkfree.apk
diff --git a/proprietary/tuna/media/LMprec_508.emd b/proprietary/tuna/media/LMprec_508.emd
diff --git a/proprietary/tuna/media/PFFprec_600.emd b/proprietary/tuna/media/PFFprec_600.emd
diff --git a/proprietary/tuna/media/audio/notifications/Nexus.mp3 b/proprietary/tuna/media/audio/notifications/Nexus.mp3
diff --git a/proprietary/tuna/media/bootanimation.zip b/proprietary/tuna/media/bootanimation.zip