From 66a03e41142507ed42bf4946cccff2d3d655653c Mon Sep 17 00:00:00 2001
From: leopesto <leopesto@gmail.com>
Date: Tue, 4 Dec 2012 21:01:00 +0100
Subject: [PATCH] Initial Release

---
 AndroidBoard.mk         |  6 +++++-
 AndroidProducts.mk      |  3 +--
 BoardConfig.mk          | 15 ++++++++++++---
 device_G2L.mk => G2L.mk | 15 +++++++++------
 cm.mk                   | 26 +++++++++++++++++++++-----
 vendorsetup.sh          | 18 ++++++++++++++++++
 6 files changed, 66 insertions(+), 17 deletions(-)
 rename device_G2L.mk => G2L.mk (58%)
 create mode 100755 vendorsetup.sh

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 541f077..91a7fc5 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -5,4 +5,8 @@ include $(CLEAR_VARS)
 ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
 
 # include the non-open-source counterpart to this file
--include vendor/Jiayu/G2L/AndroidBoardVendor.mk
+
+#-include vendor/jiayu/G2L/AndroidBoardVendor.mk
+ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),G2L)
+include $(all-subdir-makefiles)
+endif
\ No newline at end of file
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 188332e..90f6b24 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/device_G2L.mk
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/G2L.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 48f51f2..7fc8da1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,7 +1,7 @@
 USE_CAMERA_STUB := true
 
 # inherit from the proprietary version
--include vendor/Jiayu/G2L/BoardConfigVendor.mk
+#-include vendor/Jiayu/G2L/BoardConfigVendor.mk
 
 TARGET_NO_BOOTLOADER := true
 TARGET_BOARD_PLATFORM := mt657x
@@ -10,10 +10,13 @@ TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_ARCH_VARIANT_CPU := cortex-a9
 TARGET_BOOTLOADER_BOARD_NAME := G2L
 
-
+#kernel
 BOARD_KERNEL_CMDLINE := 
 BOARD_KERNEL_BASE := 0x10000000
 BOARD_KERNEL_PAGESIZE := 2048
+#TARGET_SPECIFIC_HEADER_PATH := device/jiayu/G2L/include
+#TARGET_PREBUILT_RECOVERY_KERNEL := device/jiayu/G2L/kernel_recovery
+#TARGET_KERNEL_CONFIG := cm_G2L_slim_defconfig
 
 # fix this up by examining /proc/mtd on a running device
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00600000
@@ -22,7 +25,7 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x20100000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 0xa2800000
 BOARD_FLASH_BLOCK_SIZE := 131072
 
-TARGET_PREBUILT_KERNEL := device/Jiayu/G2L/kernel
+TARGET_PREBUILT_KERNEL := device/jiayu/G2L/kernel
 TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/mt_usb/gadget/lun%d/file
 
 
@@ -30,6 +33,12 @@ BOARD_HAS_NO_SELECT_BUTTON := true
 # Use this flag if the board has a ext4 partition larger than 2gb
 #BOARD_HAS_LARGE_FILESYSTEM := true
 
+# Internal storage
+#BOARD_HAS_SDCARD_INTERNAL := true
+#BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/mmcblk0p1
+#BOARD_SDCARD_DEVICE_SECONDARY := /dev/block/mmcblk1k1
+#BOARD_SDEXT_DEVICE := /dev/block/mmcblk0p2
+
 #twrp
 DEVICE_RESOLUTION := 480x800
 RECOVERY_GRAPHICS_USE_LINELENGTH := true
diff --git a/device_G2L.mk b/G2L.mk
similarity index 58%
rename from device_G2L.mk
rename to G2L.mk
index be849e5..c4333df 100644
--- a/device_G2L.mk
+++ b/G2L.mk
@@ -3,9 +3,9 @@ $(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)
 
-$(call inherit-product-if-exists, vendor/Jiayu/G2L/G2L-vendor.mk)
+$(call inherit-product-if-exists, vendor/jiayu/G2L/G2L-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/Jiayu/G2L/overlay
+DEVICE_PACKAGE_OVERLAYS += device/jiayu/G2L/overlay
 
 LOCAL_PATH := device/Jiayu/G2L
 ifeq ($(TARGET_PREBUILT_KERNEL),)
@@ -18,12 +18,15 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
 
 PRODUCT_COPY_FILES += \
-    device/Jiayu/G2L/prebuilt/root/init.G2L.rc:root/init.G2L.rc \
-    device/Jiayu/G2L/prebuilt/root/init.G2L.usb.rc:root/init.G2L.usb.rc \
-    device/Jiayu/G2L/prebuilt/root/ueventd.G2L.rc:root/ueventd.rc \
+    device/jiayu/G2L/prebuilt/root/init.G2L.rc:root/init.G2L.rc \
+    device/jiayu/G2L/prebuilt/root/init.G2L.usb.rc:root/init.G2L.usb.rc \
+    device/jiayu/G2L/prebuilt/root/ueventd.G2L.rc:root/ueventd.rc \
 
 $(call inherit-product, build/target/product/full.mk)
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-PRODUCT_NAME := full_G2L
+PRODUCT_NAME := G2L
 PRODUCT_DEVICE := G2L
+PRODUCT_BRAND := jiayu
+PRODUCT_MODEL := G2L
+PRODUCT_MANUFACTURER := JIAYU
\ No newline at end of file
diff --git a/cm.mk b/cm.mk
index 6627a8b..2f3e2c7 100644
--- a/cm.mk
+++ b/cm.mk
@@ -4,15 +4,31 @@ $(call inherit-product, vendor/cm/config/gsm.mk)
 # Release name
 PRODUCT_RELEASE_NAME := G2L
 
+## Device identifier. This must come after all inclusions
+
+
+TARGET_SCREEN_HEIGHT := 800
+TARGET_SCREEN_WIDTH := 480
+
+$(call inherit-product, device/jiayu/G2L/G2L.mk)
+
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Inherit device configuration
-$(call inherit-product, device/Jiayu/G2L/device_G2L.mk)
+# Inherit some common CM9 stuff.
+#$(call inherit-product-if-exists, vendor/cm/config/common_mini_phone.mk)
+
+# Inherit some common CM stuff.
+$(call inherit-product-if-exists, vendor/cm/config/gsm.mk)
 
-## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := G2L
 PRODUCT_NAME := G2L
-PRODUCT_BRAND := Jiayu
+PRODUCT_BRAND := jiayu
 PRODUCT_MODEL := G2L
-PRODUCT_MANUFACTURER := Jiayu
+PRODUCT_MANUFACTURER := JIAYU
+
+UTC_DATE := $(shell date +%s)
+DATE     := $(shell date +%Y%m%d)
+
+CM_BUILDTYPE := EXPERIMENTAL
+CM_EXTRAVERSION := leopesto
\ No newline at end of file
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100755
index 0000000..36a39aa
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2011 The Android Open Source 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.
+#
+
+add_lunch_combo G2L-eng
+add_lunch_combo G2L-userdebug
\ No newline at end of file