summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-05-21 11:07:27 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-05-21 11:07:27 +0400
commitabbf90e29822e0a1b66681da45b9dc5c825a2df4 (patch)
tree310ff88bcc6a0d05ec8a2ff15d6f7497aee8942c
parentc46d2d8ef7b60d9fc7f2b06a49bcb9478aa3342e (diff)
parent353f0e3dc96b792bcc2fe0d58dfddb95622c7d41 (diff)
downloaddevice_samsung_n7000-abbf90e29822e0a1b66681da45b9dc5c825a2df4.zip
device_samsung_n7000-abbf90e29822e0a1b66681da45b9dc5c825a2df4.tar.gz
device_samsung_n7000-abbf90e29822e0a1b66681da45b9dc5c825a2df4.tar.bz2
Merge "n7000: changes for reorganized hal and mm" into ics
-rwxr-xr-xn7000.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/n7000.mk b/n7000.mk
index cc0ccb2..c208729 100755
--- a/n7000.mk
+++ b/n7000.mk
@@ -68,7 +68,6 @@ PRODUCT_PACKAGES := \
PRODUCT_PACKAGES += \
lights.exynos4 \
libhwconverter \
- libswconverter \
libs5pjpeg \
libfimg
@@ -83,7 +82,7 @@ PRODUCT_PACKAGES += \
# OMX
PRODUCT_PACKAGES += \
libstagefrighthw \
- libcsc \
+ libseccscapi \
libsecbasecomponent \
libsecosal \
libSEC_OMX_Resourcemanager \
@@ -210,7 +209,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
$(call inherit-product, frameworks/base/build/phone-xhdpi-1024-dalvik-heap.mk)
# Include exynos4 platform specific parts
-$(call inherit-product, hardware/samsung/exynos4/Android.mk)
+TARGET_HAL_PATH := hardware/samsung/exynos4/hal
+TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
+$(call inherit-product, hardware/samsung/exynos4210.mk)
$(call inherit-product-if-exists, vendor/samsung/n7000/n7000-vendor.mk)
$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)