summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXpLoDWilD <xplodgui@gmail.com>2012-05-01 17:08:15 +0200
committerXpLoDWilD <xplodgui@gmail.com>2012-05-01 17:08:15 +0200
commit778b839a1995c09f64337e2d7d434d0c248375d5 (patch)
treefbd5227d547339a0253c6afaf925e41d0567097e
parentd1e4a2fc01a5e6ec616a349ecbefcd67db631ad6 (diff)
parentfbcd6b357d052242c99988c715fa3d75a1150209 (diff)
downloaddevice_samsung_n7000-778b839a1995c09f64337e2d7d434d0c248375d5.zip
device_samsung_n7000-778b839a1995c09f64337e2d7d434d0c248375d5.tar.gz
device_samsung_n7000-778b839a1995c09f64337e2d7d434d0c248375d5.tar.bz2
Merge branch 'ics' of ssh://github.com/teamhacksung/android_device_samsung_galaxynote into ics
-rwxr-xr-xBoardConfig.mk5
-rwxr-xr-xfull_galaxynote.mk5
-rwxr-xr-xgalaxynote.mk12
3 files changed, 7 insertions, 15 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"
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.
diff --git a/galaxynote.mk b/galaxynote.mk
index 0a5558a..744bde1 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
@@ -82,7 +78,7 @@ PRODUCT_PACKAGES += \
# Sensors
PRODUCT_PACKAGES += \
sensors.exynos4
-
+
# OMX
PRODUCT_PACKAGES += \
libstagefrighthw \
@@ -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 += \
@@ -119,7 +115,7 @@ PRODUCT_PACKAGES += \
# Bluetooth MAC Address
PRODUCT_PACKAGES += \
bdaddr_read
-
+
# Live Wallpapers
PRODUCT_PACKAGES += \
Galaxy4 \
@@ -202,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