Добавлен конфиг для highscreen

AndroidProducts.mk

@@ -15,4 +15,5 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/i9300.mk
+    $(LOCAL_DIR)/newman.mk \
+    $(LOCAL_DIR)/highscreen.mk 

BoardConfig.mk

@@ -55,7 +55,7 @@ TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_USES_GENERIC_AUDIO := true
 
 # Graphics
-BOARD_EGL_CFG := vendor/samsung/i9300/proprietary/system/lib/egl/egl.cfg
+BOARD_EGL_CFG := vendor/samsung/i9300/proprietary/main/system/lib/egl/egl.cfg
 USE_OPENGL_RENDERER := true
 BOARD_USES_SKIAHWJPEG := true
 COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D
@@ -108,7 +108,7 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 BOARD_BLUEDROID_VENDOR_CONF := device/samsung/i9300/bluetooth/vnd_smdk4x12.txt
 WITH_A2DP := true
-BOARD_CUSTOM_BRCM_PATCHRAM_PLUS := ../../../vendor/samsung/i9300/proprietary/system/bin/brcm_patchram_plus.c
+BOARD_CUSTOM_BRCM_PATCHRAM_PLUS := ../../../vendor/samsung/i9300/proprietary/main/system/bin/brcm_patchram_plus.c
 BOARD_BLUETOOTH_BCM4329 := false
 
 #GPS
@@ -120,6 +120,9 @@ BOARD_BLUETOOTH_BCM4329 := false
 BOARD_VENDOR_USE_AKMD := true
 BOARD_VENDOR_USE_AKMD := akm8963
 
+#Touchscreen
+BOARD_USE_LEGACY_TOUCHSCREEN := true
+
 # Vold
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun0/file"
 

i9300.mk → highscreen.mk

@@ -12,12 +12,13 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
 # kernel
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/zImage:kernel
+    $(LOCAL_PATH)/kernel/highscreen/zImage:kernel
 
 # Packages
 PRODUCT_PACKAGES := \
     com.android.future.usb.accessory \
-    libnetcmdiface 
+    libnetcmdiface \
+    Stk
 
 # Filesystem management tools
 PRODUCT_PACKAGES += \
@@ -41,7 +42,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 
-
 # Init files
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/ramdisk/init.cm.rc:root/init.cm.rc \
@@ -50,8 +50,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/ramdisk/init.usb.rc:root/init.usb.rc \
     $(LOCAL_PATH)/ramdisk/ueventd.rc:root/ueventd.rc \
     $(LOCAL_PATH)/ramdisk/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
-#    $(LOCAL_PATH)/ramdisk/init.rc:root/init.rc \
-
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
@@ -84,7 +82,7 @@ TARGET_HAL_PATH := hardware/samsung/exynos4/hal
 
 $(call inherit-product, hardware/samsung/exynos4x12.mk)
 
-$(call inherit-product-if-exists, vendor/samsung/i9300/i9300-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/i9300/highscreen.mk)
 
 #CM
 $(call inherit-product, $(LOCAL_PATH)/cm_full.mk)
@@ -103,7 +101,7 @@ PRODUCT_TAGS += dalvik.gc.type-precise
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
 
-PRODUCT_NAME := full_i9300
+PRODUCT_NAME := highscreen
 PRODUCT_DEVICE := i9300
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung

newman.mk

@@ -0,0 +1,109 @@
+# scorpio92(4PDA), config for Cellon C8960, Newman N2, Freelander i20
+#2013
+
+LOCAL_PATH := device/samsung/i9300
+
+PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
+
+# kernel
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/kernel/newman/zImage:kernel
+
+# Packages
+PRODUCT_PACKAGES := \
+    com.android.future.usb.accessory \
+    libnetcmdiface \
+    Stk
+
+# Filesystem management tools
+PRODUCT_PACKAGES += \
+    static_busybox \
+    make_ext4fs \
+    setup_fs
+
+# Live Wallpapers
+PRODUCT_PACKAGES += \
+    Galaxy4 \
+    HoloSpiralWallpaper \
+    LiveWallpapers \
+    LiveWallpapersPicker \
+    MagicSmokeWallpapers \
+    NoiseField \
+    PhaseBeam \
+    VisualizationWallpapers \
+    librs_jni
+
+# Feature live wallpaper
+PRODUCT_COPY_FILES += \
+    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
+
+# Init files
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/ramdisk/init.cm.rc:root/init.cm.rc \
+    $(LOCAL_PATH)/ramdisk/init.smdk4x12.rc:root/init.smdk4x12.rc \
+    $(LOCAL_PATH)/ramdisk/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
+    $(LOCAL_PATH)/ramdisk/init.usb.rc:root/init.usb.rc \
+    $(LOCAL_PATH)/ramdisk/ueventd.rc:root/ueventd.rc \
+    $(LOCAL_PATH)/ramdisk/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
+
+# These are the hardware-specific features
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
+    frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
+    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
+    frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
+    frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \
+    frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
+    frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
+    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
+    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
+    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
+    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml \
+    frameworks/native/data/etc/android.hardware.touchscreen.xml:system/etc/permissions/android.hardware.touchscreen.xml \
+    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
+    frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+    frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+    frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
+    frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
+    frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
+    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+
+# Include exynos4 platform specific parts
+TARGET_HAL_PATH := hardware/samsung/exynos4/hal
+
+$(call inherit-product, hardware/samsung/exynos4x12.mk)
+
+$(call inherit-product-if-exists, vendor/samsung/i9300/newman.mk)
+
+#CM
+$(call inherit-product, $(LOCAL_PATH)/cm_full.mk)
+
+#Additional apps
+#$(call inherit-product, $(LOCAL_PATH)/Additional.mk)
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+
+# The gps config appropriate for this device
+$(call inherit-product, device/common/gps/gps_us_supl.mk)
+
+PRODUCT_TAGS += dalvik.gc.type-precise
+
+$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
+
+PRODUCT_NAME := newman
+PRODUCT_DEVICE := i9300
+PRODUCT_BRAND := samsung
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_MODEL := GT-I9300
+

ramdisk/init.cm.rc

@@ -2,17 +2,17 @@
 
 on init
 #    export ANDROID_CACHE /cache
-    export TERMINFO /system/etc/terminfo
-    export TERM linux
+#    export TERMINFO /system/etc/terminfo
+#    export TERM linux
 
 on post-fs-data
 #    mkdir /cache/dalvik-cache 0771 system system
 #    chown system system /cache/dalvik-cache
 #    chmod 0771 /cache/dalvik-cache
 
 # Import custom storage configuration
-    chmod 0644 /data/system/storage.rc
-    export_rc /data/system/storage.rc
+#    chmod 0644 /data/system/storage.rc
+#    export_rc /data/system/storage.rc
 
 on boot
     chown system system /sys/block/mmcblk0/queue/scheduler
@@ -25,8 +25,8 @@ on boot
     chmod 0664 /sys/kernel/mm/ksm/sleep_millisecs
     chown root system /sys/kernel/mm/ksm/run
     chmod 0664 /sys/kernel/mm/ksm/run
-    write /sys/kernel/mm/ksm/sleep_millisecs 1500
-    write /sys/kernel/mm/ksm/pages_to_scan 256
+#    write /sys/kernel/mm/ksm/sleep_millisecs 1500
+#    write /sys/kernel/mm/ksm/pages_to_scan 256
 
 # adb over network
 on property:service.adb.tcp.port=5555

ramdisk/init.smdk4x12.rc

@@ -14,7 +14,7 @@ service console /system/bin/sh
 on init
 
 # setup the global environment
-    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin:/system/busybox/bin:/system/busybox/sbin:/system/busybox/usr/bin:/system/busybox/usr/sbin
+#    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin:/system/busybox/bin:/system/busybox/sbin:/system/busybox/usr/bin:/system/busybox/usr/sbin
 
 #AKMD sensors
     chown system system /sys/class/compass/akm8963/enable_acc
@@ -33,8 +33,8 @@ on init
 
 on boot
 
-    setprop ro.build.product smdk4x12
-    setprop ro.product.device smdk4x12
+    setprop ro.build.product C8690
+    setprop ro.product.device C8690
     setprop ro.radio.noril yes
 
     # Permissions for backlight
@@ -45,6 +45,10 @@ on boot
 #    chown bluetooth bluetooth /dev/ttySAC0
 #    chmod 0777 /dev/ttySAC0
 
+#Mali
+    chown root system /sys/bus/platform/devices/mali_dev.0/mali_lock
+    chmod 0664 /sys/bus/platform/devices/mali_dev.0/mali_lock
+
     #chy add for reset modem
     chown root system /sys/devices/platform/smm_modem/control
     chmod 0664 /sys/devices/platform/smm_modem/control
@@ -116,16 +120,22 @@ on fs
     chmod 0777 /dev/mpuirq
     chmod 0777 /dev/timerirq
 
-on post-fs
+#on post-fs
+
+#GPS
+#    mkdir /data/gps
+#    chmod 0755 /data/gps
+#    chmod 0775 /sys/class/switch/gps_en_rst_switch/gps_en 
+#    chmod 0660 /dev/ttySAC1
+
+on post-fs-data
 
 #GPS
     mkdir /data/gps
     chmod 0755 /data/gps
     chmod 0775 /sys/class/switch/gps_en_rst_switch/gps_en 
     chmod 0660 /dev/ttySAC1
 
-on post-fs-data
-
 #Wifi
     chown wifi wifi /system/etc/wifi/wpa_supplicant.conf
     mkdir /data/misc/dhcp 0775 dhcp dhcp
@@ -136,6 +146,8 @@ on post-fs-data
     setprop wlan.interface "wlan0"
     setprop wlan.driver.status "ok"
 
+#    setprop vold.post_fs_data_done 1
+
     mkdir /data/misc/encryption 0777 system system
     mkdir /data/system 0775 system system 
     mkdir /data/system/wpa_supplicant 0775 wifi wifi 
@@ -163,8 +175,10 @@ on post-fs-data
     # chmod tmp test file for ar1000 debug 
     chmod 0777 /dev/radio0
 
-    chown root system /sys/bus/platform/devices/mali_dev.0/mali_lock
-    chmod 0664 /sys/bus/platform/devices/mali_dev.0/mali_lock
+    setprop ro.camera.sound.forced 1
+
+#    chown root system /sys/bus/platform/devices/mali_dev.0/mali_lock
+#    chmod 0664 /sys/bus/platform/devices/mali_dev.0/mali_lock
     chown root system /sys/module/bcmdhd/parameters/mac_addrs
     chmod 0664 /sys/module/bcmdhd/parameters/mac_addrs
 #    setprop wifi.interface wlan0
@@ -175,11 +189,12 @@ on post-fs-data
 
     chown radio system sys/class/flash_led_test/flashledtest
     chmod 0664 sys/class/flash_led_test/flashledtest
+
     chown system system /system/bin/at
     chmod 0777 /system/bin/at  
 
 # Set indication (checked by vold) that we have finished this action
-    setprop vold.post_fs_data_done 1
+#    setprop vold.post_fs_data_done 1
 
 #Services
 
@@ -244,6 +259,12 @@ service hciattach /system/bin/sh /system/etc/bt/init.brcm.bt.sh
     disabled
     oneshot 
 
+service file_copy /system/bin/sh /system/etc/file_copy.sh
+   class main
+   user root
+   group root	
+   oneshot
+
 #service hciattach /system/bin/brcm_patchram_plus --patchram /system/etc/bt/broadcom_bt_fw.hcd /dev/ttySAC0 --baudrate 3000000 --scopcm=0,2,1,0,0 --enable_lpm --enable_hci --tosleep 50000
 #	class main
 #	user bluetooth
@@ -269,12 +290,6 @@ service akmd /system/bin/akmd8963 -m 2 -o 1
 	group system
 	oneshot
 
-service file_copy /system/bin/sh /system/etc/file_copy.sh
-   class main
-   user root
-   group root	
-   oneshot
-
- service charger /system/bin/charger
+service charger /system/bin/charger
 	class charger