moved the prebuilt kernel into vendor/slim, other changes to make compile simpler
diff --git a/config/common.mk b/config/common.mk
index 0adcf1e..1c6f0f9 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -172,7 +172,7 @@
PRODUCT_VERSION_MAJOR = 2
PRODUCT_VERSION_MINOR = 3
-PRODUCT_VERSION_MAINTENANCE = 0
+PRODUCT_VERSION_MAINTENANCE = 1
PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=JRO03L
diff --git a/config/common_nexus.mk b/config/common_nexus.mk
new file mode 100644
index 0000000..2bb55fb
--- /dev/null
+++ b/config/common_nexus.mk
@@ -0,0 +1,2 @@
+#Device Settings for Google phones
+PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/nexus
diff --git a/config/common_sgs.mk b/config/common_sgs.mk
new file mode 100644
index 0000000..45b121a
--- /dev/null
+++ b/config/common_sgs.mk
@@ -0,0 +1,3 @@
+#Device Settings for Samsung Galaxy phones
+PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/sgs
+
diff --git a/overlay/nexus/packages/apps/Settings/res/values/config.xml b/overlay/nexus/packages/apps/Settings/res/values/config.xml
new file mode 100644
index 0000000..e74559d
--- /dev/null
+++ b/overlay/nexus/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- LED Flashlight -->
+ <bool name="has_led_flash">true</bool>
+
+ <!-- Dock Settings -->
+<!-- <bool name="has_dock_settings">true</bool>-->
+
+</resources>
diff --git a/overlay/sgs/packages/apps/Settings/res/values/bools.xml b/overlay/sgs/packages/apps/Settings/res/values/bools.xml
new file mode 100644
index 0000000..9e30f1e
--- /dev/null
+++ b/overlay/sgs/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:xliff="urnasis:names:tc:xliff:document:1.2 ">
+ <!-- Whether or not device settings should be displayed or not for the device -->
+ <bool name="has_advanced_settings">true</bool>
+</resources>
diff --git a/prebuilt/kernel/T959/boot.img b/prebuilt/kernel/T959/boot.img
new file mode 100644
index 0000000..cc3ad6a
--- /dev/null
+++ b/prebuilt/kernel/T959/boot.img
Binary files differ
diff --git a/prebuilt/kernel/T959/system/lib/modules/ansi_cprng.ko b/prebuilt/kernel/T959/system/lib/modules/ansi_cprng.ko
new file mode 100644
index 0000000..888bf88
--- /dev/null
+++ b/prebuilt/kernel/T959/system/lib/modules/ansi_cprng.ko
Binary files differ
diff --git a/prebuilt/kernel/T959/system/lib/modules/cifs.ko b/prebuilt/kernel/T959/system/lib/modules/cifs.ko
new file mode 100644
index 0000000..67485ea
--- /dev/null
+++ b/prebuilt/kernel/T959/system/lib/modules/cifs.ko
Binary files differ
diff --git a/prebuilt/kernel/T959/system/lib/modules/mls_utf8.ko b/prebuilt/kernel/T959/system/lib/modules/mls_utf8.ko
new file mode 100644
index 0000000..ed71b20
--- /dev/null
+++ b/prebuilt/kernel/T959/system/lib/modules/mls_utf8.ko
Binary files differ
diff --git a/prebuilt/kernel/T959/system/lib/modules/nls_utf8.ko b/prebuilt/kernel/T959/system/lib/modules/nls_utf8.ko
new file mode 100644
index 0000000..ccfa269
--- /dev/null
+++ b/prebuilt/kernel/T959/system/lib/modules/nls_utf8.ko
Binary files differ
diff --git a/prebuilt/kernel/crespo/boot.img b/prebuilt/kernel/crespo/boot.img
new file mode 100644
index 0000000..56320ed
--- /dev/null
+++ b/prebuilt/kernel/crespo/boot.img
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/.DS_Store b/prebuilt/kernel/crespo/system/.DS_Store
new file mode 100644
index 0000000..704956f
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/etc/.DS_Store b/prebuilt/kernel/crespo/system/etc/.DS_Store
new file mode 100644
index 0000000..b1a0e7d
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/etc/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/etc/init.d/98mounts b/prebuilt/kernel/crespo/system/etc/init.d/98mounts
new file mode 100644
index 0000000..38b98df
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/etc/init.d/98mounts
@@ -0,0 +1,3 @@
+#!/system/bin/sh
+
+mount -o remount,noauto_da_alloc,nosuid,nodev,noatime,nodiratime /data /data
diff --git a/prebuilt/kernel/crespo/system/lib/.DS_Store b/prebuilt/kernel/crespo/system/lib/.DS_Store
new file mode 100644
index 0000000..bab97b5
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/lib/hw/lights.s5pc110.so b/prebuilt/kernel/crespo/system/lib/hw/lights.s5pc110.so
new file mode 100644
index 0000000..8a70a85
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/hw/lights.s5pc110.so
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Decoder.so b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Decoder.so
new file mode 100644
index 0000000..5451df2
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Decoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Encoder.so b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Encoder.so
new file mode 100644
index 0000000..6c7edfb
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Encoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Decoder.so b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Decoder.so
new file mode 100644
index 0000000..a47d34e
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Decoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Encoder.so b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Encoder.so
new file mode 100644
index 0000000..5469e53
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Encoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/modules/.DS_Store b/prebuilt/kernel/crespo/system/modules/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/modules/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo/system/modules/scsi_wait_scan.ko b/prebuilt/kernel/crespo/system/modules/scsi_wait_scan.ko
new file mode 100644
index 0000000..9005187
--- /dev/null
+++ b/prebuilt/kernel/crespo/system/modules/scsi_wait_scan.ko
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/boot.img b/prebuilt/kernel/crespo4g/boot.img
new file mode 100644
index 0000000..65595f7
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/boot.img
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/.DS_Store b/prebuilt/kernel/crespo4g/system/.DS_Store
new file mode 100644
index 0000000..704956f
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/etc/.DS_Store b/prebuilt/kernel/crespo4g/system/etc/.DS_Store
new file mode 100644
index 0000000..b1a0e7d
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/etc/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/etc/init.d/98mounts b/prebuilt/kernel/crespo4g/system/etc/init.d/98mounts
new file mode 100644
index 0000000..38b98df
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/etc/init.d/98mounts
@@ -0,0 +1,3 @@
+#!/system/bin/sh
+
+mount -o remount,noauto_da_alloc,nosuid,nodev,noatime,nodiratime /data /data
diff --git a/prebuilt/kernel/crespo4g/system/lib/.DS_Store b/prebuilt/kernel/crespo4g/system/lib/.DS_Store
new file mode 100644
index 0000000..bab97b5
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/lib/hw/lights.s5pc110.so b/prebuilt/kernel/crespo4g/system/lib/hw/lights.s5pc110.so
new file mode 100644
index 0000000..8a70a85
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/hw/lights.s5pc110.so
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Decoder.so b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Decoder.so
new file mode 100644
index 0000000..5451df2
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Decoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Encoder.so b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Encoder.so
new file mode 100644
index 0000000..6c7edfb
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.AVC.Encoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Decoder.so b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Decoder.so
new file mode 100644
index 0000000..a47d34e
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Decoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Encoder.so b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Encoder.so
new file mode 100644
index 0000000..5469e53
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/lib/libOMX.SEC.M4V.Encoder.so
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/modules/.DS_Store b/prebuilt/kernel/crespo4g/system/modules/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/modules/.DS_Store
Binary files differ
diff --git a/prebuilt/kernel/crespo4g/system/modules/scsi_wait_scan.ko b/prebuilt/kernel/crespo4g/system/modules/scsi_wait_scan.ko
new file mode 100644
index 0000000..9005187
--- /dev/null
+++ b/prebuilt/kernel/crespo4g/system/modules/scsi_wait_scan.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/boot.img b/prebuilt/kernel/d2-common/boot.img
new file mode 100644
index 0000000..447a891
--- /dev/null
+++ b/prebuilt/kernel/d2-common/boot.img
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/btlock.ko b/prebuilt/kernel/d2-common/system/lib/modules/btlock.ko
new file mode 100644
index 0000000..57251e0
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/btlock.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/dhd.ko b/prebuilt/kernel/d2-common/system/lib/modules/dhd.ko
new file mode 100644
index 0000000..e812c4c
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/dhd.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/evbug.ko b/prebuilt/kernel/d2-common/system/lib/modules/evbug.ko
new file mode 100644
index 0000000..8315ee5
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/evbug.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/gspca_main.ko b/prebuilt/kernel/d2-common/system/lib/modules/gspca_main.ko
new file mode 100644
index 0000000..e4e3996
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/gspca_main.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/qce40.ko b/prebuilt/kernel/d2-common/system/lib/modules/qce40.ko
new file mode 100644
index 0000000..83fa058
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/qce40.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/qcedev.ko b/prebuilt/kernel/d2-common/system/lib/modules/qcedev.ko
new file mode 100644
index 0000000..a8fac58
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/qcedev.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/qcrypto.ko b/prebuilt/kernel/d2-common/system/lib/modules/qcrypto.ko
new file mode 100644
index 0000000..c6771fe
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/qcrypto.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/scsi_wait_scan.ko b/prebuilt/kernel/d2-common/system/lib/modules/scsi_wait_scan.ko
new file mode 100644
index 0000000..8748740
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/scsi_wait_scan.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/spidev.ko b/prebuilt/kernel/d2-common/system/lib/modules/spidev.ko
new file mode 100644
index 0000000..c2e9bd1
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/spidev.ko
Binary files differ
diff --git a/prebuilt/kernel/d2-common/system/lib/modules/vpnclient.ko b/prebuilt/kernel/d2-common/system/lib/modules/vpnclient.ko
new file mode 100644
index 0000000..93ec452
--- /dev/null
+++ b/prebuilt/kernel/d2-common/system/lib/modules/vpnclient.ko
Binary files differ
diff --git a/prebuilt/kernel/i9000/boot.img b/prebuilt/kernel/i9000/boot.img
new file mode 100755
index 0000000..d7bdaab
--- /dev/null
+++ b/prebuilt/kernel/i9000/boot.img
Binary files differ
diff --git a/prebuilt/kernel/i9000/system/lib/modules/ansi_cprng.ko b/prebuilt/kernel/i9000/system/lib/modules/ansi_cprng.ko
new file mode 100644
index 0000000..888bf88
--- /dev/null
+++ b/prebuilt/kernel/i9000/system/lib/modules/ansi_cprng.ko
Binary files differ
diff --git a/prebuilt/kernel/i9000/system/lib/modules/cifs.ko b/prebuilt/kernel/i9000/system/lib/modules/cifs.ko
new file mode 100644
index 0000000..67485ea
--- /dev/null
+++ b/prebuilt/kernel/i9000/system/lib/modules/cifs.ko
Binary files differ
diff --git a/prebuilt/kernel/i9000/system/lib/modules/mls_utf8.ko b/prebuilt/kernel/i9000/system/lib/modules/mls_utf8.ko
new file mode 100644
index 0000000..ed71b20
--- /dev/null
+++ b/prebuilt/kernel/i9000/system/lib/modules/mls_utf8.ko
Binary files differ
diff --git a/prebuilt/kernel/i9000/system/lib/modules/nls_utf8.ko b/prebuilt/kernel/i9000/system/lib/modules/nls_utf8.ko
new file mode 100644
index 0000000..ccfa269
--- /dev/null
+++ b/prebuilt/kernel/i9000/system/lib/modules/nls_utf8.ko
Binary files differ
diff --git a/prebuilt/kernel/i9100/system/lib/modules/dhd.ko b/prebuilt/kernel/i9100/system/lib/modules/dhd.ko
new file mode 100644
index 0000000..b9aa0a3
--- /dev/null
+++ b/prebuilt/kernel/i9100/system/lib/modules/dhd.ko
Binary files differ
diff --git a/prebuilt/kernel/i9100/system/lib/modules/driver.ko b/prebuilt/kernel/i9100/system/lib/modules/driver.ko
new file mode 100644
index 0000000..cb7f28c
--- /dev/null
+++ b/prebuilt/kernel/i9100/system/lib/modules/driver.ko
Binary files differ
diff --git a/prebuilt/kernel/i9100/system/lib/modules/scsi_wait.ko b/prebuilt/kernel/i9100/system/lib/modules/scsi_wait.ko
new file mode 100644
index 0000000..9a07ea8
--- /dev/null
+++ b/prebuilt/kernel/i9100/system/lib/modules/scsi_wait.ko
Binary files differ
diff --git a/prebuilt/kernel/i9100/zImage b/prebuilt/kernel/i9100/zImage
new file mode 100755
index 0000000..f1acdc8
--- /dev/null
+++ b/prebuilt/kernel/i9100/zImage
Binary files differ
diff --git a/prebuilt/kernel/i9300/boot.img b/prebuilt/kernel/i9300/boot.img
new file mode 100644
index 0000000..39abcf8
--- /dev/null
+++ b/prebuilt/kernel/i9300/boot.img
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/Si4709_driver.ko b/prebuilt/kernel/i9300/system/lib/modules/Si4709_driver.ko
new file mode 100644
index 0000000..2a9e72e
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/Si4709_driver.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/btlock.ko b/prebuilt/kernel/i9300/system/lib/modules/btlock.ko
new file mode 100644
index 0000000..1c0a2ba
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/btlock.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/cifs.ko b/prebuilt/kernel/i9300/system/lib/modules/cifs.ko
new file mode 100644
index 0000000..5195461
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/cifs.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/commkm.ko b/prebuilt/kernel/i9300/system/lib/modules/commkm.ko
new file mode 100644
index 0000000..6b69ee8
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/commkm.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/dhd.ko b/prebuilt/kernel/i9300/system/lib/modules/dhd.ko
new file mode 100644
index 0000000..5daf63b
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/dhd.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/mvpkm.ko b/prebuilt/kernel/i9300/system/lib/modules/mvpkm.ko
new file mode 100644
index 0000000..75087f8
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/mvpkm.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/pvtcpkm.ko b/prebuilt/kernel/i9300/system/lib/modules/pvtcpkm.ko
new file mode 100644
index 0000000..fd91da0
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/pvtcpkm.ko
Binary files differ
diff --git a/prebuilt/kernel/i9300/system/lib/modules/scsi_wait_scan.ko b/prebuilt/kernel/i9300/system/lib/modules/scsi_wait_scan.ko
new file mode 100644
index 0000000..a8d1d93
--- /dev/null
+++ b/prebuilt/kernel/i9300/system/lib/modules/scsi_wait_scan.ko
Binary files differ
diff --git a/products/slim_crespo.mk b/products/slim_crespo.mk
index 7304bf8..5c78786 100644
--- a/products/slim_crespo.mk
+++ b/products/slim_crespo.mk
@@ -6,9 +6,27 @@
# Inherit some common stuff.
$(call inherit-product, vendor/slim/config/gsm.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_nexus.mk)
+
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/crespo/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/crespo/system/etc/init.d/98mounts:system/etc/init.d/98mounts \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Decoder.so:system/lib/libOMX.SEC.AVC.Decoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Encoder.so:systemlib/libOMX.SEC.AVC.Encoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Decoder.so:system/lib/libOMX.SEC.M4V.Decoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Encoder.so:system/lib/libOMX.SEC.M4V.Encoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/hw/lights.s5pc110.so:system/lib/hw/lights.s5pc110.so \
+ vendor/slim/prebuilt/kernel/crespo/system/modules/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko
+
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := NS
@@ -19,4 +37,4 @@
PRODUCT_DEVICE := crespo
PRODUCT_BRAND := Google
PRODUCT_MODEL := Nexus S
-PRODUCT_MANUFACTURER := Samsung
\ No newline at end of file
+PRODUCT_MANUFACTURER := Samsung
diff --git a/products/slim_crespo4g.mk b/products/slim_crespo4g.mk
index 22d6c2f..03ca26a 100644
--- a/products/slim_crespo4g.mk
+++ b/products/slim_crespo4g.mk
@@ -6,9 +6,26 @@
# Inherit some common stuff.
$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_nexus.mk)
+
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/crespo/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/crespo/system/etc/init.d/98mounts:system/etc/init.d/98mounts \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Decoder.so:system/lib/libOMX.SEC.AVC.Decoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.AVC.Encoder.so:systemlib/libOMX.SEC.AVC.Encoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Decoder.so:system/lib/libOMX.SEC.M4V.Decoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/libOMX.SEC.M4V.Encoder.so:system/lib/libOMX.SEC.M4V.Encoder.so \
+ vendor/slim/prebuilt/kernel/crespo/system/lib/hw/lights.s5pc110.so:system/lib/hw/lights.s5pc110.so \
+ vendor/slim/prebuilt/kernel/crespo/system/modules/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := NS4G
diff --git a/products/slim_d2att.mk b/products/slim_d2att.mk
index 70e303e..4b3f9ac 100644
--- a/products/slim_d2att.mk
+++ b/products/slim_d2att.mk
@@ -9,9 +9,26 @@
# Inherit some common SLIM stuff.
$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/d2-common/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/scsi_wait_scan.ko:system/lib/modules/scsi_wait_scan.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qce40.ko:system/lib/modules/qce40.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/spidev.ko:system/lib/modules/spidev.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qcrypto.ko:system/lib/modules/qcrypto.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qcedev.ko:system/lib/modules/qcedev.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/vpnclient.ko:system/lib/modules/vpnclient.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/gspca_main.ko:system/lib/modules/gpsca_main.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/btlock.ko:system/lib/modules/btlock.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/dhd.ko:system/lib/modules/dhd.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/evbug.ko:system/lib/modules/evbug.ko
+
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d2uc TARGET_DEVICE=d2att BUILD_FINGERPRINT="d2att-userdebug 4.1.1 JRO03L eng.ar.20120827.191311 release-keys"
PRIVATE_BUILD_DESC="samsung/full_d2att/d2att:4.1.1/JRO03L/eng.ar.20120827.191311:userdebug/release-keys"
@@ -19,4 +36,4 @@
PRODUCT_DEVICE := d2att
PRODUCT_BRAND := samsung
PRODUCT_MODEL := SAMSUNG-SGH-I747
-PRODUCT_MANUFACTURER := Samsung
\ No newline at end of file
+PRODUCT_MANUFACTURER := Samsung
diff --git a/products/slim_d2vzw.mk b/products/slim_d2vzw.mk
index d27a89f..c9f341d 100644
--- a/products/slim_d2vzw.mk
+++ b/products/slim_d2vzw.mk
@@ -9,6 +9,23 @@
# Inherit some common SLIM stuff.
$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/d2-common/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/scsi_wait_scan.ko:system/lib/modules/scsi_wait_scan.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qce40.ko:system/lib/modules/qce40.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/spidev.ko:system/lib/modules/spidev.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qcrypto.ko:system/lib/modules/qcrypto.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/qcedev.ko:system/lib/modules/qcedev.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/vpnclient.ko:system/lib/modules/vpnclient.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/gspca_main.ko:system/lib/modules/gpsca_main.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/btlock.ko:system/lib/modules/btlock.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/dhd.ko:system/lib/modules/dhd.ko \
+ vendor/slim/prebuilt/kernel/d2-common/system/lib/modules/evbug.ko:system/lib/modules/evbug.ko
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/slim_galaxysmtd.mk b/products/slim_galaxysmtd.mk
index 282327d..6da1ee8 100644
--- a/products/slim_galaxysmtd.mk
+++ b/products/slim_galaxysmtd.mk
@@ -10,9 +10,26 @@
# Inherit device configuration
$(call inherit-product, device/samsung/galaxysmtd/full_galaxysmtd.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/i9000/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/i9000/boot.img:kernel \
+ device/samsung/aries-common/recovery.fstab:ramdisk.img \
+ device/samsung/aries-common/recovery.fstab:recovery/root/etc/recovery.fstab \
+ vendor/slim/prebuilt/kernel/i9000/system/lib/modules/ansi_cprng.ko:system/lib/modules/ansi_cprng.ko \
+ vendor/slim/prebuilt/kernel/i9000/system/lib/modules/cifs.ko:system/lib/modules/cifs.ko \
+ vendor/slim/prebuilt/kernel/i9000/system/lib/modules/mls_utf8.ko:system/lib/modules/mls_utf8.ko \
+ vendor/slim/prebuilt/kernel/i9000/system/lib/modules/nls_utf8.ko:system/lib/modules/nls_utf8.ko
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := galaxysmtd
PRODUCT_NAME := slim_galaxysmtd
diff --git a/products/slim_grouper.mk b/products/slim_grouper.mk
index 6e78cb4..40c8fd8 100644
--- a/products/slim_grouper.mk
+++ b/products/slim_grouper.mk
@@ -6,6 +6,9 @@
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := Nexus7
diff --git a/products/slim_i9100.mk b/products/slim_i9100.mk
index 49d97ec..fa6fa7c 100644
--- a/products/slim_i9100.mk
+++ b/products/slim_i9100.mk
@@ -26,9 +26,22 @@
# Inherit device configuration
$(call inherit-product, device/samsung/i9100/full_i9100.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/i9100/zImage:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/i9100/zImage:kernel \
+ device/samsung/i9100/recovery.fstab:ramdisk.img \
+ device/samsung/i9100/recovery.fstab:recovery/root/etc/recovery.fstab \
+ vendor/slim/prebuilt/kernel/i9100/system/lib/modules/scsi_wait.ko:system/lib/modules/scsi_wait.ko \
+ vendor/slim/prebuilt/kernel/i9100/system/lib/modules/dhd.ko:system/lib/modules/dhd.ko \
+ vendor/slim/prebuilt/kernel/i9100/system/lib/modules/driver.ko:system/lib/modules/driver.ko
+
# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := i9100
PRODUCT_NAME := slim_i9100
@@ -37,4 +50,4 @@
# Set build fingerprint / ID / Prduct Name ect.
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 TARGET_DEVICE=GT-I9100 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.0.3/IML74K/XXLPQ:user/release-keys
-PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys"
\ No newline at end of file
+PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys"
diff --git a/products/slim_i9300.mk b/products/slim_i9300.mk
index e052a7e..4514c08 100644
--- a/products/slim_i9300.mk
+++ b/products/slim_i9300.mk
@@ -14,9 +14,27 @@
# Inherit device configuration
$(call inherit-product, device/samsung/i9300/full_i9300.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/zImage:system/slimkernel/boot.img \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/zImage:kernel \
+ device/samsung/i9300/recovery.fstab:ramdisk.img \
+ device/samsung/i9300/recovery.fstab:recovery/root/etc/recovery.fstab \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/Si4709_driver.ko:system/lib/modules/Si4709_driver.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/scsi_wait_scan.ko:system/lib/modules/scsi_wait_scan.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/cifs.ko:system/lib/modules/cifs.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/pvtcpkm.ko:system/lib/modules/pvtcpkm.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/mvpkm.ko:system/lib/modules/mvpkm.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/btlock.ko:system/lib/modules/btlock.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/dhd.ko:system/lib/modules/dhd.ko \
+ vendor/slim/kernel/prebuilt/i9300/proprietary/system/lib/modules/commkm.ko:system/lib/modules/commkm.ko
+
# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := i9300
PRODUCT_NAME := slim_i9300
@@ -26,4 +44,4 @@
# Set build fingerprint / ID / Product Name ect.
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m0xx TARGET_DEVICE=m0 BUILD_FINGERPRINT="samsung/m0xx/m0:4.0.4/IMM76D/I9300XXALE8:user/release-keys"
-PRIVATE_BUILD_DESC="m0xx-user 4.0.4 IMM76D I9300XXALE8 release-keys"
\ No newline at end of file
+PRIVATE_BUILD_DESC="m0xx-user 4.0.4 IMM76D I9300XXALE8 release-keys"
diff --git a/products/slim_maguro.mk b/products/slim_maguro.mk
index 24d6486..7847416 100644
--- a/products/slim_maguro.mk
+++ b/products/slim_maguro.mk
@@ -10,9 +10,15 @@
# Inherit some common stuff.
$(call inherit-product, vendor/slim/config/gsm.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_nexus.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := GN-GSM
@@ -24,3 +30,4 @@
PRODUCT_BRAND := google
PRODUCT_MODEL := Galaxy Nexus
PRODUCT_MANUFACTURER := samsung
+PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/products/slim_toro.mk b/products/slim_toro.mk
index abc9cd8..1f47159 100644
--- a/products/slim_toro.mk
+++ b/products/slim_toro.mk
@@ -7,9 +7,15 @@
# Inherit some common stuff.
$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_nexus.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := GN-VZN
diff --git a/products/slim_toroplus.mk b/products/slim_toroplus.mk
index 14384b5..48b5d51 100644
--- a/products/slim_toroplus.mk
+++ b/products/slim_toroplus.mk
@@ -7,9 +7,15 @@
# Inherit some common stuff.
$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_nexus.mk)
+
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
# Release name
PRODUCT_RELEASE_NAME := GN-SPR
diff --git a/products/slim_vibrantmtd.mk b/products/slim_vibrantmtd.mk
index 6ed1859..745ec1f 100644
--- a/products/slim_vibrantmtd.mk
+++ b/products/slim_vibrantmtd.mk
@@ -10,9 +10,27 @@
# Inherit device configuration
$(call inherit-product, device/samsung/vibrantmtd/full_vibrantmtd.mk)
-PRODUCT_COPY_FILES += \
+# Inherit device settings
+$(call inherit-product, vendor/slim/config/common_sgs.mk)
+
+#copy kernel and modules
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/kernel/T959/boot.img:system/slimkernel/boot.img \
+ vendor/slim/prebuilt/kernel/T959/boot.img:kernel \
+ device/samsung/aries-common/recovery.fstab:ramdisk.img \
+ device/samsung/aries-common/recovery.fstab:recovery/root/etc/recovery.fstab \
+ vendor/slim/prebuilt/kernel/T959/system/lib/modules/ansi_cprng.ko:system/lib/modules/ansi_cprng.ko \
+ vendor/slim/prebuilt/kernel/T959/system/lib/modules/cifs.ko:system/lib/modules/cifs.ko \
+ vendor/slim/prebuilt/kernel/T959/system/lib/modules/mls_utf8.ko:system/lib/modules/mls_utf8.ko \
+ vendor/slim/prebuilt/kernel/T959/system/lib/modules/nls_utf8.ko:system/lib/modules/nls_utf8.ko
+
+PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.camera.res=5MP
+
+
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := vibrantmtd
PRODUCT_NAME := slim_vibrantmtd
diff --git a/tools/squisher b/tools/squisher
index ec60f63..6c93cfb 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -42,6 +42,7 @@
DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
DELETE_MEDIA="*.qmg"
DELETE_APKS="Home.apk LiveWallpapers.apk VoiceDialer.apk SoundRecorder.apk VisualizationWallpapers.apk "
+DELETE_GALLERY="Gallery2.apk"
REPACK=$OUT/repack.d
printf "Sanitizing environment..."
@@ -123,15 +124,26 @@
[ -d $REPACK/ota/system/lib/modules ] && \
find $REPACK/ota/system/lib/modules -name "*.ko" -print0 | xargs -0 arm-eabi-strip --strip-unneeded
+# Fix LCD Density for slim
+DEVICELCD=`sed -n -e'/ro\.sf\.lcd_density/s/^.*=//p' $OUT/system/build.prop`
+if [ "$DEVICELCD" = "240" ]; then
+ sed -i 's/ro.sf.lcd_density=240/ro.sf.lcd_density=182/g' $OUT/system/build.prop
+elif [ "$DEVICELCD" = "320" ]; then
+ sed -i 's/ro.sf.lcd_density=320/ro.sf.lcd_density=241/g' $OUT/system/build.prop
+elif [ "$DEVICELCD" = "213" ]; then
+ sed -i 's/ro.sf.lcd_density=213/ro.sf.lcd_density=182/g' $OUT/system/build.prop
+fi
+cp -f $OUT/system/build.prop $REPACK/ota/system/build.prop
+
+# Delete Gallery2 for 5MP cameras
+CAMERARESOLUTION=`sed -n -e'/ro\.camera\.res/s/^.*=//p' $REPACK/ota/system/build.prop`
+if [ "$CAMERARESOLUTION" = "5MP" ];then
+ rm -f $REPACK/ota/system/app/Gallery2.apk
+fi
+
# Swap boot.img
-DEVICEINFO=`sed -n -e'/ro\.product\.device/s/^.*=//p' $REPACK/ota/system/build.prop`
-if [ "$DEVICEINFO" = "maguro" ]; then
- printf "Don't Mess with Maguro boot.img"
-elif [ "$DEVICEINFO" = "toroplus" ]; then
- printf "Don't Mess with ToroPlus boot.img"
-elif [ "$DEVICEINFO" = "toro" ]; then
- printf "Don't Mess with Toro boot.img"
-else
+PREBUILTKERNEL=$OUT/system/slimkernel/boot.img
+if [ -e "$PREBUILTKERNEL" ];then
rm -f $REPACK/ota/boot.img
mv -f $REPACK/ota/system/slimkernel/boot.img $REPACK/ota/boot.img
fi