From 6334a497238f82df84e127a49ba9788c1334cbcd Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Mon, 30 Apr 2012 19:04:04 -0400
Subject: Clean up makefile to not double-pull media_profiles.xml

Change-Id: Idcd5cfbf4a34a7ff05807899b60aafec03489a05
---
 galaxynote.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/galaxynote.mk b/galaxynote.mk
index 0a5558a..ce8a5e4 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -32,10 +32,6 @@ PRODUCT_COPY_FILES := \
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/asound.conf:system/etc/asound.conf
 
-# omx
-PRODUCT_COPY_FILES += \
-	device/samsung/galaxynote/configs/media_profiles.xml:system/etc/media_profiles.xml \
-	
 # Vold and Storage
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/vold.fstab:system/etc/vold.fstab
@@ -103,7 +99,7 @@ PRODUCT_PACKAGES += \
     libOMX.SEC.MP3.Decoder
 
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxys2/configs/media_profiles.xml:system/etc/media_profiles.xml
+    device/samsung/galaxynote/configs/media_profiles.xml:system/etc/media_profiles.xml
 
 # Ril
 PRODUCT_PROPERTY_OVERRIDES += \
-- 
cgit v1.1


From 8b30834e83165ac1770f1f774d99589c0b728046 Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Mon, 30 Apr 2012 19:28:08 -0400
Subject: BoardConfig: remove ifeq statements depending on
 USES_CAMERA_STUB=false

Hopefully will stop media_profiles.xml from being overwritten

Change-Id: Ie59a472d924197ad08f10cf57df421916764d320
---
 BoardConfig.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index b341ea0..8c414a5 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -84,11 +84,6 @@ BOARD_USES_MFC_FPS := true
 # Audio
 BOARD_USE_YAMAHAPLAYER := true
 
-# Camera
-ifeq ($(USE_CAMERA_STUB),false)
-BOARD_CAMERA_LIBRARIES := libcamera
-endif
-
 # RIL
 BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0"
 
-- 
cgit v1.1


From 474286761f38f1396741db4ae9993cba6322903f Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Tue, 1 May 2012 08:18:40 -0400
Subject: Clean up extra tabs in galaxynote.mk

Change-Id: I148bbb0738673168d0425afc0e4d65a37e6d2d43
---
 galaxynote.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/galaxynote.mk b/galaxynote.mk
index ce8a5e4..744bde1 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -78,7 +78,7 @@ PRODUCT_PACKAGES += \
 # Sensors
 PRODUCT_PACKAGES += \
 	sensors.exynos4
-	
+
 # OMX
 PRODUCT_PACKAGES += \
     libstagefrighthw \
@@ -115,7 +115,7 @@ PRODUCT_PACKAGES += \
 # Bluetooth MAC Address
 PRODUCT_PACKAGES += \
 	bdaddr_read
-	
+
 # Live Wallpapers
 PRODUCT_PACKAGES += \
 	Galaxy4 \
@@ -198,7 +198,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.locationfeatures=1 \
     ro.com.google.networklocation=1
-	
+
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 # Set default USB interface
-- 
cgit v1.1


From fbcd6b357d052242c99988c715fa3d75a1150209 Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Tue, 1 May 2012 08:19:16 -0400
Subject: Call only full_base_telephony.mk like galaxys2 does - hopefully will
 stop media_profiles from getting overwritten.

Change-Id: Iabad17187b20b96b2ef4358d43af8fb9fcff9abe
---
 full_galaxynote.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/full_galaxynote.mk b/full_galaxynote.mk
index e8adae1..ca1a282 100755
--- a/full_galaxynote.mk
+++ b/full_galaxynote.mk
@@ -20,8 +20,9 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+#$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+#$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
 $(call inherit-product, device/samsung/galaxynote/galaxynote.mk)
 
 # Discard inherited values and use our own instead.
-- 
cgit v1.1