Merge branch 'gingerbread' of https://github.com/koush/proprietary_ve…

…ndor_samsung into HEAD

aries-common/aries-vendor-blobs.mk

@@ -64,3 +64,31 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/aries-common/proprietary/CE147F01.bin:system/firmware/CE147F01.bin \
     vendor/samsung/aries-common/proprietary/CE147F02.bin:system/firmware/CE147F02.bin \
     vendor/samsung/aries-common/proprietary/CE147F03.bin:system/firmware/CE147F03.bin
+
+# low power mode
+PRODUCT_COPY_FILES += \
+    vendor/samsung/aries-common/proprietary/charging_mode:system/bin/charging_mode \
+    vendor/samsung/aries-common/proprietary/playlpm:system/bin/playlpm \
+    vendor/samsung/aries-common/proprietary/libQmageDecoder.so:system/lib/libQmageDecoder.so \
+    vendor/samsung/aries-common/proprietary/battery_charging_10.qmg:system/media/battery_charging_10.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_100.qmg:system/media/battery_charging_100.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_15.qmg:system/media/battery_charging_15.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_20.qmg:system/media/battery_charging_20.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_25.qmg:system/media/battery_charging_25.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_30.qmg:system/media/battery_charging_30.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_35.qmg:system/media/battery_charging_35.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_40.qmg:system/media/battery_charging_40.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_45.qmg:system/media/battery_charging_45.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_5.qmg:system/media/battery_charging_5.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_50.qmg:system/media/battery_charging_50.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_55.qmg:system/media/battery_charging_55.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_60.qmg:system/media/battery_charging_60.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_65.qmg:system/media/battery_charging_65.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_70.qmg:system/media/battery_charging_70.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_75.qmg:system/media/battery_charging_75.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_80.qmg:system/media/battery_charging_80.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_85.qmg:system/media/battery_charging_85.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_90.qmg:system/media/battery_charging_90.qmg \
+    vendor/samsung/aries-common/proprietary/battery_charging_95.qmg:system/media/battery_charging_95.qmg \
+    vendor/samsung/aries-common/proprietary/chargingwarning.qmg:system/media/chargingwarning.qmg \
+    vendor/samsung/aries-common/proprietary/Disconnected.qmg:system/media/Disconnected.qmg

c1-common/c1-vendor-blobs.mk

@@ -78,6 +78,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/c1-common/proprietary/firmware/qt602240.fw:system/etc/firmware/qt602240.fw \
     vendor/samsung/c1-common/proprietary/firmware/RS_M5LS_OB.bin:system/etc/firmware/RS_M5LS_OB.bin \
     vendor/samsung/c1-common/proprietary/firmware/RS_M5LS_OC.bin:system/etc/firmware/RS_M5LS_OC.bin \
+    vendor/samsung/c1-common/proprietary/firmware/RS_M5LS_OE.bin:system/etc/firmware/RS_M5LS_OE.bin \
     vendor/samsung/c1-common/proprietary/firmware/RS_M5LS_TB.bin:system/etc/firmware/RS_M5LS_TB.bin \
     vendor/samsung/c1-common/proprietary/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin
 

captivatemtd/captivatemtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/captivatemtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/captivatemtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/captivatemtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -29,10 +28,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/captivatemtd/proprietary/gpsd:system/vendor/bin/gpsd \
     vendor/samsung/captivatemtd/proprietary/gps.xml:system/vendor/etc/gps.xml \
     vendor/samsung/captivatemtd/proprietary/gps.aries.so:system/vendor/lib/hw/gps.aries.so \
-    vendor/samsung/captivatemtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/captivatemtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/aries-common/proprietary/libsensorservice.so:system/vendor/lib/libsensorservice.so \
     vendor/samsung/aries-common/proprietary/libsensor_yamaha_test.so:system/vendor/lib/libsensor_yamaha_test.so
-
-
-
-

fascinatemtd/fascinatemtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/fascinatemtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/fascinatemtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/fascinatemtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -25,7 +24,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/fascinatemtd/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
     vendor/samsung/fascinatemtd/proprietary/libsec-ril40.so:system/lib/libsec-ril40.so \
     vendor/samsung/fascinatemtd/proprietary/rild:system/bin/rild \
-    vendor/samsung/fascinatemtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/fascinatemtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/fascinatemtd/proprietary/pppd_runner:system/bin/pppd_runner \
     vendor/samsung/fascinatemtd/proprietary/gpsd:system/vendor/bin/gpsd \
     vendor/samsung/fascinatemtd/proprietary/gps.xml:system/vendor/etc/gps.xml \
@@ -41,5 +40,3 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/fascinatemtd/proprietary/PhoneConfig.apk:system/app/PhoneConfig.apk \
     vendor/samsung/fascinatemtd/proprietary/ProgramMenu.apk:system/app/ProgramMenu.apk \
     vendor/samsung/fascinatemtd/proprietary/ProgramMenuSystem.apk:system/app/ProgramMenuSystem.apk
-
-

galaxysbmtd/galaxysbmtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/galaxysbmtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/galaxysbmtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/galaxysbmtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -29,8 +28,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/galaxysbmtd/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
     vendor/samsung/galaxysbmtd/proprietary/libsec-ril.so:system/lib/libsec-ril.so \
     vendor/samsung/galaxysbmtd/proprietary/rild:system/bin/rild \
-    vendor/samsung/galaxysbmtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/galaxysbmtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/aries-common/proprietary/libsensorservice.so:system/vendor/lib/libsensorservice.so \
     vendor/samsung/aries-common/proprietary/libsensor_yamaha_test.so:system/vendor/lib/libsensor_yamaha_test.so
-
-

galaxysmtd/galaxysmtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/galaxysmtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/galaxysmtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/galaxysmtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -29,8 +28,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/galaxysmtd/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
     vendor/samsung/galaxysmtd/proprietary/libsec-ril.so:system/lib/libsec-ril.so \
     vendor/samsung/galaxysmtd/proprietary/rild:system/bin/rild \
-    vendor/samsung/galaxysmtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/galaxysmtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/aries-common/proprietary/libsensorservice.so:system/vendor/lib/libsensorservice.so \
     vendor/samsung/aries-common/proprietary/libsensor_yamaha_test.so:system/vendor/lib/libsensor_yamaha_test.so
-
-

mesmerizemtd/mesmerizemtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/mesmerizemtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/mesmerizemtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/mesmerizemtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -25,7 +24,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/mesmerizemtd/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
     vendor/samsung/mesmerizemtd/proprietary/libsec-ril40.so:system/lib/libsec-ril40.so \
     vendor/samsung/mesmerizemtd/proprietary/rild:system/bin/rild \
-    vendor/samsung/mesmerizemtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/mesmerizemtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/mesmerizemtd/proprietary/pppd_runner:system/bin/pppd_runner \
     vendor/samsung/mesmerizemtd/proprietary/gpsd:system/vendor/bin/gpsd \
     vendor/samsung/mesmerizemtd/proprietary/gps.xml:system/vendor/etc/gps.xml \

showcasemtd/showcasemtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/showcasemtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/showcasemtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/showcasemtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -25,7 +24,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/showcasemtd/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
     vendor/samsung/showcasemtd/proprietary/libsec-ril40.so:system/lib/libsec-ril40.so \
     vendor/samsung/showcasemtd/proprietary/rild:system/bin/rild \
-    vendor/samsung/showcasemtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/showcasemtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/showcasemtd/proprietary/pppd_runner:system/bin/pppd_runner \
     vendor/samsung/showcasemtd/proprietary/gpsd:system/vendor/bin/gpsd \
     vendor/samsung/showcasemtd/proprietary/gps.xml:system/vendor/etc/gps.xml \

vibrantmtd/vibrantmtd-vendor-blobs.mk

@@ -14,7 +14,6 @@
 
 # Prebuilt libraries that are needed to build open-source libraries
 PRODUCT_COPY_FILES := \
-    vendor/samsung/vibrantmtd/proprietary/libcamera.so:obj/lib/libcamera.so \
     vendor/samsung/vibrantmtd/proprietary/libril.so:obj/lib/libril.so \
     vendor/samsung/vibrantmtd/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
 
@@ -28,7 +27,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/vibrantmtd/proprietary/gps.aries.so:system/vendor/lib/hw/gps.aries.so \
     vendor/samsung/vibrantmtd/proprietary/rild:system/bin/rild \
     vendor/samsung/vibrantmtd/proprietary/agpsd:system/vendor/bin/gpsd \
-    vendor/samsung/vibrantmtd/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/samsung/vibrantmtd/proprietary/libcamera.so:system/lib/libsamsungcamera.so \
     vendor/samsung/aries-common/proprietary/libsensorservice.so:system/vendor/lib/libsensorservice.so \
     vendor/samsung/aries-common/proprietary/libsensor_yamaha_test.so:system/vendor/lib/libsensor_yamaha_test.so