summaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-13 02:31:48 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-13 02:31:48 +0100
commitd17844cd79f60a338f0798acf06641efc17eae0c (patch)
tree052dd84792f2b0e5859f7df430a75bf4f81231e8 /common.mk
parent325722855f24fbc017a46d969adaf35c237fe805 (diff)
parentd508a5afb5ef8a760a09c6f0e8e1a3da07a17a47 (diff)
downloaddevice_samsung_smdk4412-common-d17844cd79f60a338f0798acf06641efc17eae0c.zip
device_samsung_smdk4412-common-d17844cd79f60a338f0798acf06641efc17eae0c.tar.gz
device_samsung_smdk4412-common-d17844cd79f60a338f0798acf06641efc17eae0c.tar.bz2
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_device_samsung_smdk4412-common into replicant-6.0
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk15
1 files changed, 5 insertions, 10 deletions
diff --git a/common.mk b/common.mk
index 45a3e8a..48d9602 100644
--- a/common.mk
+++ b/common.mk
@@ -76,16 +76,6 @@ PRODUCT_PACKAGES := \
macloader \
tinymix
-ifneq ($(TARGET_HAS_CAM_FLASH) ,false)
-PRODUCT_PACKAGES += \
- Torch
-endif
-
-# Charger
-PRODUCT_PACKAGES += \
- charger \
- charger_res_images
-
# MFC API
PRODUCT_PACKAGES += \
libsecmfcdecapi \
@@ -123,6 +113,11 @@ PRODUCT_PACKAGES += \
wpa_supplicant \
wpa_supplicant.conf
+# Charger
+PRODUCT_PACKAGES += \
+ charger \
+ charger_res_images
+
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \