Initial merge to lp
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 39b9bb9..31c178f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 The CyanogenMod Project
+# Copyright (C) 2014 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.
@@ -12,28 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# This file sets variables that control the way modules are built
-# thorughout the system. It should not be used to conditionally
-# disable makefiles (the proper mechanism to control what gets
-# included in a build is to use PRODUCT_PACKAGES in a product
-# definition file).
-#
-
-# WARNING: This line must come *before* including the proprietary
-# variant, so that it gets overwritten by the parent (which goes
-# against the traditional rules of inheritance).
-USE_CAMERA_STUB := true
-
# inherit from common celox
-include device/samsung/celox-common/BoardConfigCommon.mk
# inherit from the proprietary version
-include vendor/samsung/skyrocket/BoardConfigVendor.mk
-TARGET_BOOTLOADER_BOARD_NAME := MSM8660_SURF
-
# Assert
+TARGET_BOARD_INFO_FILE ?= device/samsung/skyrocket/board-info.txt
TARGET_OTA_ASSERT_DEVICE := SGH-I727,skyrocket
# Kernel
@@ -41,23 +27,13 @@
TARGET_KERNEL_SOURCE := kernel/samsung/msm8660-common
TARGET_KERNEL_CUSTOM_TOOLCHAIN := linaro-arm-eabi-4.7
-# Assert minimum baseband version
-TARGET_BOARD_INFO_FILE ?= device/samsung/skyrocket/board-info.txt
-
-# cat /proc/emmc
-#dev: size erasesize name
-#mmcblk0p22: 00fffc00 00000200 "recovery"
-#mmcblk0p8: 01000000 00000200 "boot"
-#mmcblk0p24: 5ffffc00 00000200 "system"
-#mmcblk0p26: 13fffe00 00000200 "cache"
-#mmcblk0p25: 9ffffe00 00000200 "userdata"
-
-TARGET_USERIMAGES_USE_EXT4 := true
+# Partitions
+BOARD_FLASH_BLOCK_SIZE := 131072
BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16776192
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 838860800
BOARD_USERDATAIMAGE_PARTITION_SIZE := 20044333056
-BOARD_FLASH_BLOCK_SIZE := 131072
+TARGET_USERIMAGES_USE_EXT4 := true
+# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/skyrocket/bluetooth
-
diff --git a/device.mk b/device.mk
index 36ff1fa..dd68492 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 The CyanogenMod Project
+# Copyright (C) 2014 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.
@@ -14,21 +14,19 @@
# limitations under the License.
#
-## (2) Also get non-open-source specific aspects if available
+# Get non-open-source specific aspects if available
$(call inherit-product-if-exists, vendor/samsung/skyrocket/skyrocket-vendor.mk)
-## overlays
-DEVICE_PACKAGE_OVERLAYS += device/samsung/skyrocket/overlay
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
# Ramdisk
PRODUCT_COPY_FILES += \
- device/samsung/skyrocket/ramdisk/init.qcom.usb.rc:root/init.qcom.usb.rc \
+ $(LOCAL_PATH)/ramdisk/init.qcom.usb.rc:root/init.qcom.usb.rc
-# BT firmware
+# Bluetooth
PRODUCT_COPY_FILES += \
- device/samsung/skyrocket/firmware/bcm4330B1.hcd:system/etc/firmware/bcm4330B1.hcd
+ $(LOCAL_PATH)/firmware/bcm4330B1.hcd:system/etc/firmware/bcm4330B1.hcd
# Inherit from celox-common
$(call inherit-product, device/samsung/celox-common/celox-common.mk)
-
-$(call inherit-product-if-exists, vendor/samsung/skyrocket/skyrocket-vendor.mk)
diff --git a/full_skyrocket.mk b/full_skyrocket.mk
index 8969ead..b329245 100644
--- a/full_skyrocket.mk
+++ b/full_skyrocket.mk
@@ -11,7 +11,7 @@
# 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.
-
+
#
# This file is the build configuration for a full Android
# build for maguro hardware. This cleanly combines a set of
@@ -20,12 +20,6 @@
# details, it only fundamentally contains two inherit-product
# lines, full and maguro, hence its name.
#
-
-# Torch
-PRODUCT_PACKAGES := \
- Torch
-
-BOARD_HAVE_NFC := true
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)