1 files changed, 4 insertions, 25 deletions
diff --git a/common.mk b/common.mk
index bf22206..48d9602 100644
--- a/common.mk
+++ b/common.mk
@@ -39,9 +39,6 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf \
     $(COMMON_PATH)/audio/silence.wav:system/etc/sound/silence.wav
 
-# Camera FW
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/80cfw:system/etc/init.d/80cfw
 
 # Netflix hack
 PRODUCT_COPY_FILES += \
@@ -67,9 +64,8 @@ PRODUCT_PACKAGES := \
     audio.primary.smdk4x12 \
     audio.r_submix.default \
     audio.usb.default \
+    Camera \
     com.android.future.usb.accessory \
-    Gello \
-    gralloc.exynos4 \
     hwcomposer.exynos4 \
     libfimg \
     libnetcmdiface \
@@ -78,7 +74,6 @@ PRODUCT_PACKAGES := \
     libsync \
     lights.exynos4 \
     macloader \
-    Snap \
     tinymix
 
 # MFC API
@@ -110,19 +105,6 @@ PRODUCT_PACKAGES += \
     make_ext4fs \
     setup_fs
 
-# Live Wallpapers
-PRODUCT_PACKAGES += \
-    Galaxy4 \
-    HoloSpiralWallpaper \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    NoiseField \
-    PhaseBeam \
-    VisualizationWallpapers \
-    librs_jni
-
-
 # Wifi
 PRODUCT_PACKAGES += \
     libwpa_client \
@@ -133,6 +115,7 @@ PRODUCT_PACKAGES += \
 
 # Charger
 PRODUCT_PACKAGES += \
+    charger \
     charger_res_images
 
 # These are the hardware-specific features
@@ -159,10 +142,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml
 
-# Feature live wallpaper
-PRODUCT_COPY_FILES += \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
-
 # Keylayouts
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
@@ -183,5 +162,5 @@ TARGET_HAL_PATH := hardware/samsung/exynos4/hal
 TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
 $(call inherit-product, hardware/samsung/exynos4x12.mk)
 
-# Include non-opensource parts
-$(call inherit-product, vendor/samsung/smdk4412-common/common-vendor.mk)
+# Include non-opensource parts if available
+$(call inherit-product-if-exists, vendor/samsung/smdk4412-common/common-vendor.mk)