Skip to content

Commit

Permalink
Basic nseventhousandonehundredonize
Browse files Browse the repository at this point in the history
  • Loading branch information
imilka committed Oct 29, 2012
1 parent 0d132fd commit 5888754
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

LOCAL_PATH := $(call my-dir)

ifeq ($(TARGET_DEVICE),i9300)
ifeq ($(TARGET_DEVICE),n7100)

include $(call all-makefiles-under,$(LOCAL_PATH))

Expand Down
2 changes: 1 addition & 1 deletion AndroidProducts.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#

PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/full_i9300.mk
$(LOCAL_DIR)/full_n7100.mk
16 changes: 8 additions & 8 deletions BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ TARGET_NO_RADIOIMAGE := true

TARGET_PROVIDES_INIT := true
TARGET_PROVIDES_INIT_TARGET_RC := true
TARGET_RECOVERY_INITRC := device/samsung/i9300/recovery.rc
TARGET_RECOVERY_INITRC := device/samsung/n7100/recovery.rc

TARGET_SPECIFIC_HEADER_PATH := device/samsung/i9300/overlay/include
TARGET_SPECIFIC_HEADER_PATH := device/samsung/n7100/overlay/include

# Kernel
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
TARGET_KERNEL_CONFIG := cyanogenmod_i9300_defconfig
TARGET_KERNEL_CONFIG := cyanogenmod_n7100_defconfig
BOARD_KERNEL_CMDLINE := "console=ttySAC2,115200"
BOARD_KERNEL_BASE := 0x40000000
BOARD_KERNEL_PAGESIZE := 2048
Expand All @@ -70,7 +70,7 @@ BOARD_FLASH_BLOCK_SIZE := 4096
TARGET_USERIMAGES_USE_EXT4 := true

# Graphics
BOARD_EGL_CFG := device/samsung/i9300/configs/egl.cfg
BOARD_EGL_CFG := device/samsung/n7100/configs/egl.cfg
USE_OPENGL_RENDERER := true
BOARD_USES_SKIAHWJPEG := true
COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D
Expand Down Expand Up @@ -135,8 +135,8 @@ BOARD_HAVE_SAMSUNG_BLUETOOTH := true
TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun%d/file"

# Recovery
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/i9300/recovery/recovery_keys.c
BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/i9300/recovery/graphics.c
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/n7100/recovery/recovery_keys.c
BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/n7100/recovery/graphics.c
BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
BOARD_UMS_LUNFILE := "/sys/class/android_usb/android0/f_mass_storage/lun0/file"
BOARD_USES_MMCUTILS := true
Expand All @@ -149,7 +149,7 @@ BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charg
BOARD_BATTERY_DEVICE_NAME := "battery"

# assert
TARGET_OTA_ASSERT_DEVICE := m0,i9300,GT-I9300
TARGET_OTA_ASSERT_DEVICE := m0,n7100,GT-N7100

# inherit from the proprietary version
-include vendor/samsung/i9300/BoardConfigVendor.mk
-include vendor/samsung/n7100/BoardConfigVendor.mk
12 changes: 6 additions & 6 deletions cm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$(call inherit-product, vendor/cm/config/gsm.mk)

# Release name
PRODUCT_RELEASE_NAME := i9300
PRODUCT_RELEASE_NAME := n7100

# Boot animation
TARGET_SCREEN_HEIGHT := 1280
Expand All @@ -12,14 +12,14 @@ TARGET_SCREEN_WIDTH := 720
$(call inherit-product, vendor/cm/config/common_full_phone.mk)

# Inherit device configuration
$(call inherit-product, device/samsung/i9300/full_i9300.mk)
$(call inherit-product, device/samsung/n7100/full_n7100.mk)

# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := i9300
PRODUCT_NAME := cm_i9300
PRODUCT_DEVICE := n7100
PRODUCT_NAME := cm_n7100
PRODUCT_BRAND := samsung
PRODUCT_MODEL := GT-I9300
PRODUCT_MODEL := GT-N7100
PRODUCT_MANUFACTURER := samsung

# Set build fingerprint / ID / Product Name ect.
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m0xx TARGET_DEVICE=m0 BUILD_FINGERPRINT="samsung/m0xx/m0:4.1.1/JRO03C/I9300XXDLIB:user/release-keys" PRIVATE_BUILD_DESC="m0xx-user 4.1.1 JRO03C I9300XXDLIB release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t03gxx TARGET_DEVICE=t03g BUILD_FINGERPRINT="samsung/t03gxx/t03g:4.1.1/JRO03C/N7100XXALJ3:user/release-keys" PRIVATE_BUILD_DESC="t03gxx-user 4.1.1 JRO03C N7100XXALJ3 release-keys"
8 changes: 4 additions & 4 deletions full_i9300.mk → full_n7100.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# This is where we'd set a backup provider if we had one
#$(call inherit-product, device/sample/products/backup_overlay.mk)
$(call inherit-product, device/samsung/i9300/i9300.mk)
$(call inherit-product, device/samsung/n7100/n7100.mk)

# Discard inherited values and use our own instead.
PRODUCT_NAME := full_i9300
PRODUCT_DEVICE := i9300
PRODUCT_NAME := full_n7100
PRODUCT_DEVICE := n7100
PRODUCT_BRAND := samsung
PRODUCT_MANUFACTURER := samsung
PRODUCT_MODEL := GT-I9300
PRODUCT_MODEL := GT-N7100
4 changes: 2 additions & 2 deletions i9300.mk → n7100.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

LOCAL_PATH := device/samsung/i9300
LOCAL_PATH := device/samsung/n7100

DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay

Expand Down Expand Up @@ -214,4 +214,4 @@ TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
$(call inherit-product, hardware/samsung/exynos4x12.mk)
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)

$(call inherit-product-if-exists, vendor/samsung/i9300/i9300-vendor.mk)
$(call inherit-product-if-exists, vendor/samsung/n7100/n7100-vendor.mk)
7 changes: 3 additions & 4 deletions proprietary-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT

MANUFACTURER=samsung
DEVICE=i9300
DEVICE=n7100

mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary

Expand Down Expand Up @@ -154,8 +154,7 @@ adb pull /system/vendor/firmware/setfile.bin ../../../vendor/$MANUFACTURER/$DEVI
# See the License for the specific language governing permissions and
# limitations under the License.
LOCAL_PATH := vendor/samsung/i9300
LOCAL_PATH := vendor/samsung/n7100
PRODUCT_PACKAGES += \\
libTVOut \\
libUMP \\
Expand Down Expand Up @@ -319,7 +318,7 @@ EOF
LOCAL_PATH := \$(call my-dir)
ifneq (\$(filter i9300,\$(TARGET_DEVICE)),)
ifneq (\$(filter n7100,\$(TARGET_DEVICE)),)
include \$(CLEAR_VARS)
LOCAL_MODULE := libTVOut
Expand Down

0 comments on commit 5888754

Please sign in to comment.