From 54ae53c6adb01a02da3a6e8e78291834600d1b9e Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Wed, 25 Jul 2012 18:32:28 +0200 Subject: Update with i9100 things --- AndroidProducts.mk | 2 +- BoardConfig.mk | 2 +- cm.dependencies | 7 +- cm.mk | 2 +- full_n7000.mk | 7 - n7000.mk | 8 ++ .../frameworks/base/core/res/res/values/config.xml | 145 +++++++++++++++++++++ proprietary-files.sh | 2 +- proprietary-n7000-files.txt | 21 +++ system.prop | 2 +- 10 files changed, 185 insertions(+), 13 deletions(-) create mode 100644 overlay/frameworks/base/core/res/res/values/config.xml create mode 100644 proprietary-n7000-files.txt diff --git a/AndroidProducts.mk b/AndroidProducts.mk index fbc118f..9599fe5 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/full_n700Â0.mk + $(LOCAL_DIR)/full_i9100.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 1699ab2..ee5ce1c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -28,7 +28,7 @@ TARGET_KERNEL_CONFIG := cyanogenmod_n7000_defconfig TARGET_SPECIFIC_HEADER_PATH += device/samsung/n7000/overlay/include EXYNOS4210_ENHANCEMENTS := true # assert -TARGET_OTA_ASSERT_DEVICE := galaxynote,n7000,GT-N7000 +TARGET_OTA_ASSERT_DEVICE := galaxynote,n7000,N7000,GT-N7000 # Use the non-open-source parts, if they're present -include vendor/samsung/n7000/BoardConfigVendor.mk diff --git a/cm.dependencies b/cm.dependencies index bf2e154..f834d9d 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -8,7 +8,12 @@ "target_path": "kernel/samsung/smdk4210" }, { + "repository": "android_hardware_samsung", + "target_path": "hardware/samsung" + }, + { "repository": "android_packages_apps_SamsungServiceMode", - "target_path": "packages/apps/SamsungServiceMode" + "target_path": "packages/apps/SamsungServiceMode", + "branch": "ics" } ] diff --git a/cm.mk b/cm.mk index 7b34910..e0125e9 100644 --- a/cm.mk +++ b/cm.mk @@ -33,4 +33,4 @@ PRODUCT_BRAND := Samsung PRODUCT_MODEL := GT-N7000 # Set build fingerprint / ID / Prduct Name ect. -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N7000 TARGET_DEVICE=GT-N7000 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" +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" diff --git a/full_n7000.mk b/full_n7000.mk index 37ddff8..ff23bbe 100644 --- a/full_n7000.mk +++ b/full_n7000.mk @@ -22,7 +22,6 @@ # # Inherit from those products. Most specific first. -$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, device/samsung/n7000/n7000.mk) @@ -32,9 +31,3 @@ PRODUCT_DEVICE := n7000 PRODUCT_BRAND := samsung PRODUCT_MANUFACTURER := samsung PRODUCT_MODEL := GT-N7000 - -# This device is xhdpi. -PRODUCT_AAPT_CONFIG := normal xhdpi -PRODUCT_AAPT_PREF_CONFIG := xhdpi -PRODUCT_LOCALES += xhdpi - diff --git a/n7000.mk b/n7000.mk index d16d0fe..bb7a838 100644 --- a/n7000.mk +++ b/n7000.mk @@ -22,6 +22,14 @@ LOCAL_PATH := device/samsung/n7000 # Overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +# This device is xhdpi. +PRODUCT_AAPT_CONFIG := normal xhdpi +PRODUCT_AAPT_PREF_CONFIG := xhdpi +PRODUCT_LOCALES += xhdpi + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.sf.lcd_density=320 + # Keylayout PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml new file mode 100644 index 0000000..3546cf6 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,145 @@ + + + + + + + + true + + + + 6 + 9 + 14 + 20 + 30 + 46 + 68 + 103 + 154 + 231 + 346 + 519 + 778 + 1168 + 1752 + 2627 + 3941 + 5912 + 8867 + + + + + 19 + 23 + 26 + 30 + 34 + 39 + 45 + 51 + 59 + 67 + 77 + 88 + 101 + 116 + 133 + 152 + 174 + 199 + 228 + 250 + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 29 + + diff --git a/proprietary-files.sh b/proprietary-files.sh index 4d6ea7a..03f6f56 100755 --- a/proprietary-files.sh +++ b/proprietary-files.sh @@ -16,7 +16,7 @@ VENDOR=samsung COMMON=galaxys2-common -DEVICE=i9100 +DEVICE=n7000 COMMONOUTDIR=vendor/$VENDOR/$COMMON COMMONBASE=../../../$COMMONOUTDIR/proprietary COMMONMAKEFILE=../../../$COMMONOUTDIR/common-vendor-blobs.mk diff --git a/proprietary-n7000-files.txt b/proprietary-n7000-files.txt new file mode 100644 index 0000000..7759f41 --- /dev/null +++ b/proprietary-n7000-files.txt @@ -0,0 +1,21 @@ +system/bin/rild +system/lib/libril.so +system/lib/libsec-ril.so +system/lib/libsecril-client.so +system/bin/bcm4330B1.hcd +system/etc/wifi/bcm4330_apsta.bin +system/etc/wifi/bcm4330_mfg.bin +system/etc/wifi/bcm4330_p2p.bin +system/etc/wifi/bcm4330_sta.bin +system/etc/wifi/nvram_mfg.txt +system/etc/wifi/nvram_mfg.txt_murata +system/etc/wifi/nvram_net.txt +system/etc/wifi/nvram_net.txt_AU +system/etc/wifi/nvram_net.txt_IL +system/etc/wifi/nvram_net.txt_SG +system/etc/wifi/nvram_net.txt_TN +system/etc/wifi/nvram_net.txt_murata +system/etc/wifi/nvram_net.txt_murata_AU +system/etc/wifi/nvram_net.txt_murata_IL +system/etc/wifi/nvram_net.txt_murata_SG +system/etc/wifi/nvram_net.txt_murata_TN diff --git a/system.prop b/system.prop index 1a6fbb2..0a65944 100644 --- a/system.prop +++ b/system.prop @@ -1,5 +1,5 @@ # -# system.prop for n7000 +# system.prop for i9100 # rild.libpath=/system/lib/libsec-ril.so -- cgit v1.1