Finished renaming device to galaxynote

4 files changed, 22 insertions, 20 deletions

diff --git a/Android.mk b/Android.mk
index 0159edb..260c4a4 100755
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),note)
+ifeq ($(TARGET_DEVICE),galaxynote)
 
 ifneq ($(TARGET_SIMULATOR),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 8ae9f4d..639a468 100755
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,16 +14,5 @@
 # limitations under the License.
 #
 
-#
-# This file should set PRODUCT_MAKEFILES to a list of product makefiles
-# to expose to the build system.  LOCAL_DIR will already be set to
-# the directory containing this file.
-#
-# This file may not rely on the value of any variable other than
-# LOCAL_DIR; do not use any conditionals, and do not look up the
-# value of any variable that isn't set in this file or in a file that
-# it includes.
-#
-
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/full_galaxynote.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2ecb03d..fc21a3c 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -34,7 +34,6 @@ TARGET_BOARD_INFO_FILE := device/samsung/galaxynote/board-info.txt
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
-TARGET_OTA_ASSERT_DEVICE := galaxynote,GT-N7000
 
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
@@ -48,7 +47,6 @@ TARGET_PREBUILT_KERNEL := device/samsung/galaxynote/kernel
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_USES_MMCUTILS := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 8388608
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 893386752
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648
@@ -116,9 +114,13 @@ BOARD_HAS_VIBRATOR_IMPLEMENTATION := ../../device/samsung/galaxynote/vibrator/ts
 BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxynote/recovery/recovery_keys.c
 BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/galaxynote/recovery/graphics.c
 BOARD_UMS_LUNFILE := /sys/class/android_usb/android0/f_mass_storage/lun/file
+BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true 
 BOARD_HAS_NO_SELECT_BUTTON := true
 
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxynote/shbootimg.mk
+# assert
+TARGET_OTA_ASSERT_DEVICE := galaxynote,GT-N7000
+
+-include vendor/samsung/galaxynote/BoardConfigVendor.mk
 
--include device/samsung/galaxynote/BoardConfigVendor.mk
+BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxynote/shbootimg.mk
diff --git a/galaxynote.mk b/galaxynote.mk
index b80a4bf..30d179d 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -30,6 +30,12 @@ PRODUCT_COPY_FILES := \
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/apns-conf.xml:system/etc/apns-conf.xml \
 	device/samsung/galaxynote/configs/spn-conf.xml:system/etc/spn-conf.xml
+
+# Audio
+# soundbooster.txt - needs to be at /data/soundbooster.txt
+PRODUCT_COPY_FILES += \
+	device/samsung/galaxynote/configs/asound.conf:system/etc/asound.conf \
+	device/samsung/galaxynote/configs/soundbooster.txt:system/etc/audio/soundbooster.txt
 	
 # Touchscreen
 PRODUCT_COPY_FILES += \
@@ -74,8 +80,10 @@ PRODUCT_COPY_FILES += \
 # Packages
 PRODUCT_PACKAGES := \
     audio.primary.smdkv310 \
+    audio_policy.smdkv310 \
     gps.smdkv310 \
-	com.android.future.usb.accessory
+    smdkv310_hdcp_keys \
+    com.android.future.usb.accessory
 
 # Charger
 #PRODUCT_PACKAGES += \
@@ -105,8 +113,13 @@ PRODUCT_PACKAGES += \
 
 # Live Wallpapers
 PRODUCT_PACKAGES += \
+	Galaxy4 \
+	HoloSpiralWallpaper \
 	LiveWallpapers \
 	LiveWallpapersPicker \
+	MagicSmokeWallpapers \
+	NoiseField \
+	PhaseBeam \
 	VisualizationWallpapers \
 	librs_jni
 
@@ -129,9 +142,7 @@ PRODUCT_COPY_FILES += \
 	packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.opengles.version=131072
-
-PRODUCT_PROPERTY_OVERRIDES += \
+	ro.opengles.version=131072 \
 	ro.sf.lcd_density=284 \
 	hwui.render_dirty_regions=false \
     hwui.disable_vsync=true