From 7efa579eeaf430235409171ac86f24cf2758a2a7 Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Sat, 21 Apr 2012 01:41:49 -0400
Subject: more changes from galaxys2

Change-Id: I7a0c5dd0c196bc55358dac47836d3d821d62ef7c
---
 BoardConfig.mk                                     |  1 +
 configs/secomxregistry                             |  6 ---
 configs/somxreg.conf                               | 17 --------
 extract-files.sh                                   |  3 --
 galaxynote.mk                                      | 50 ++++++++++++++++++----
 init.smdk4210.rc                                   |  1 -
 .../packages/apps/Settings/res/values/config.xml   | 24 +++++++++++
 overlay/packages/apps/Torch/res/values/config.xml  | 26 +++++++++++
 8 files changed, 92 insertions(+), 36 deletions(-)
 delete mode 100644 configs/secomxregistry
 delete mode 100644 configs/somxreg.conf
 create mode 100644 overlay/packages/apps/Settings/res/values/config.xml
 create mode 100644 overlay/packages/apps/Torch/res/values/config.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1dbf20e..b341ea0 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,6 +29,7 @@ TARGET_ARCH_VARIANT_CPU := cortex-a9
 ARCH_ARM_HAVE_NEON := true
 ARCH_ARM_HAVE_TLS_REGISTER := true
 TARGET_BOARD_PLATFORM := exynos4
+TARGET_SOC := exynos4210
 TARGET_BOOTLOADER_BOARD_NAME := smdk4210
 TARGET_BOARD_INFO_FILE := device/samsung/galaxynote/board-info.txt
 
diff --git a/configs/secomxregistry b/configs/secomxregistry
deleted file mode 100644
index 8350c1c..0000000
--- a/configs/secomxregistry
+++ /dev/null
@@ -1,6 +0,0 @@
-libOMX.SEC.AVC.Decoder.so
-libOMX.SEC.M4V.Decoder.so
-libOMX.SEC.WMV.Decoder.so
-libOMX.SEC.AVC.Encoder.so
-libOMX.SEC.M4V.Encoder.so
-libOMX.SEC.MP3.Decoder.so
diff --git a/configs/somxreg.conf b/configs/somxreg.conf
deleted file mode 100644
index e4fb687..0000000
--- a/configs/somxreg.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-libsomx264d.so
-libsomx263d.so
-libsomxmp4vd.so
-libsomxvc1d.so
-libsomxmp3d.so
-libsomxaacd.so
-libsomxflacd.so
-libsomxac3d.so
-libsomxwmad.so
-libsomxamrd.so
-libsomxvenc.so
-libsomxwmv7d.so
-libsomxwmv8d.so
-libsomxsr263d.so
-libsomxmp43d.so
-libsomxaace.so
-libsomxamre.so
diff --git a/extract-files.sh b/extract-files.sh
index 1443532..8b04d88 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -43,14 +43,12 @@ adb pull /system/lib/libcaps.so ../../../vendor/$MANUFACTURER/$COMMON/proprietar
 adb pull /system/lib/libEGL.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libEGL.so
 adb pull /system/lib/libexif.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libexif.so
 adb pull /system/lib/libfimc.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libfimc.so
-adb pull /system/lib/libfimg.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libfimg.so
 adb pull /system/lib/libGLESv1_CM.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libGLESv1_CM.so
 adb pull /system/lib/libGLESv2.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libGLESv2.so
 adb pull /system/lib/libMali.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libMali.so
 adb pull /system/lib/libOpenSLES.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libOpenSLES.so
 adb pull /system/lib/libPanoraMax3.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libPanoraMax3.so
 adb pull /system/lib/libril.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libril.so
-adb pull /system/lib/libs5pjpeg.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libs5pjpeg.so
 adb pull /system/lib/libseccamera_jni.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libseccamera_jni.so
 adb pull /system/lib/libseccameracore.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libseccameracore.so
 adb pull /system/lib/libsecjpegarcsoft.so ../../../vendor/$MANUFACTURER/$COMMON/proprietary/libsecjpegarcsoft.so
@@ -211,7 +209,6 @@ PRODUCT_COPY_FILES += \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libexif.so:system/lib/libexif.so \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libfimc.so:system/lib/libfimc.so \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libfimc.so:obj/lib/libfimc.so \\
-    vendor/__MANUFACTURER__/__COMMON__/proprietary/libfimg.so:system/lib/libfimg.so \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libGLESv1_CM.so:system/lib/libGLESv1_CM.so \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libGLESv2.so:system/lib/libGLESv2.so \\
     vendor/__MANUFACTURER__/__COMMON__/proprietary/libMali.so:system/lib/libMali.so \\
diff --git a/galaxynote.mk b/galaxynote.mk
index a7a04af..fea14b6 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -35,20 +35,21 @@ PRODUCT_COPY_FILES += \
 # omx
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/media_profiles.xml:system/etc/media_profiles.xml \
-	device/samsung/galaxynote/configs/secomxregistry:system/etc/secomxregistry \
-	device/samsung/galaxynote/configs/somxreg.conf:system/etc/somxreg.conf
 	
-# Vold
+# Vold and Storage
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/vold.fstab:system/etc/vold.fstab
 
+PRODUCT_PROPERTY_OVERRIDES := \
+    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
+
 # Wifi
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/nvram_net.txt:system/etc/nvram_net.txt \
 	device/samsung/galaxynote/configs/nvram_mfg.txt:system/etc/nvram_mfg.txt \
 	device/samsung/galaxynote/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal
 
-PRODUCT_PROPERTY_OVERRIDES := \
+PRODUCT_PROPERTY_OVERRIDES += \
 	wifi.interface=wlan0 \
 	wifi.supplicant_scan_interval=20
 
@@ -58,20 +59,51 @@ PRODUCT_COPY_FILES += \
 
 # Packages
 PRODUCT_PACKAGES := \
+	Camera \
 	camera.exynos4 \
-    TvOut \
+	Torch \
+	TvOut \
 	TvOutHack \
-    com.android.future.usb.accessory \
+	com.android.future.usb.accessory \
+
+# HAL
+PRODUCT_PACKAGES += \
+    lights.exynos4 \
+    libhwconverter \
+    libswconverter \
+    libs5pjpeg \
+    libfimg
 
-# Camera
+# MFC API
 PRODUCT_PACKAGES += \
-	Camera
+    libsecmfcapi
 
 # Sensors
 PRODUCT_PACKAGES += \
-	lights.exynos4 \
 	sensors.exynos4
 	
+# OMX
+PRODUCT_PACKAGES += \
+    libstagefrighthw \
+    libcsc \
+    libsecbasecomponent \
+    libsecosal \
+    libSEC_OMX_Resourcemanager \
+    libSEC_OMX_Core \
+    libSEC_OMX_Vdec \
+    libOMX.SEC.AVC.Decoder \
+    libOMX.SEC.M4V.Decoder \
+    libOMX.SEC.WMV.Decoder \
+    libOMX.SEC.VP8.Decoder \
+    libSEC_OMX_Venc \
+    libOMX.SEC.AVC.Encoder \
+    libOMX.SEC.M4V.Encoder \
+    libSEC_OMX_Adec \
+    libOMX.SEC.MP3.Decoder
+
+PRODUCT_COPY_FILES += \
+    device/samsung/galaxys2/configs/media_profiles.xml:system/etc/media_profiles.xml
+
 # Ril
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=Smdk4210RIL \
diff --git a/init.smdk4210.rc b/init.smdk4210.rc
index 53b344f..0bdf1ad 100644
--- a/init.smdk4210.rc
+++ b/init.smdk4210.rc
@@ -31,7 +31,6 @@ on early-init
 
 on fs
 # mount ext4 partitions
-    mount ext4 /dev/block/mmcblk0p9 /system
     mount ext4 /dev/block/mmcblk0p9 /system noatime wait ro
     mount ext4 /dev/block/mmcblk0p7 /cache nosuid nodev noatime wait
     mount ext4 /dev/block/mmcblk0p10 /data nosuid nodev noatime wait noauto_da_alloc
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
new file mode 100644
index 0000000..f2c22fd
--- /dev/null
+++ b/overlay/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 xmlns:xliff="urnasis:names:tc:xliff:document:1.2 ">
+	<!-- LED Flashlight -->
+	<bool name="has_led_flash">true</bool>
+
+	<!-- Dock Settings -->
+	<bool name="has_dock_settings">true</bool>
+</resources>
diff --git a/overlay/packages/apps/Torch/res/values/config.xml b/overlay/packages/apps/Torch/res/values/config.xml
new file mode 100644
index 0000000..d0ea1d0
--- /dev/null
+++ b/overlay/packages/apps/Torch/res/values/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+    <!-- If there is no sysfs-based control mechanism, enable this -->
+    <bool name="useCameraInterface">true</bool>
+
+</resources>
-- 
cgit v1.1