diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:31:48 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:31:48 +0100 |
| commit | d17844cd79f60a338f0798acf06641efc17eae0c (patch) | |
| tree | 052dd84792f2b0e5859f7df430a75bf4f81231e8 | |
| parent | 325722855f24fbc017a46d969adaf35c237fe805 (diff) | |
| parent | d508a5afb5ef8a760a09c6f0e8e1a3da07a17a47 (diff) | |
| download | device_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
| -rw-r--r-- | common.mk | 15 | ||||
| -rwxr-xr-x | extract-files.sh | 11 | ||||
| -rw-r--r-- | proprietary-files.txt | 4 |
3 files changed, 5 insertions, 25 deletions
@@ -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 \ diff --git a/extract-files.sh b/extract-files.sh index e380cb5..622acd2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -56,7 +56,6 @@ done LOCAL_PATH := vendor/samsung/smdk4412-common PRODUCT_PACKAGES += \\ - libTVOut \\ libUMP \\ libfimc @@ -106,16 +105,6 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libUMP -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libUMP.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) LOCAL_MODULE := libfimc LOCAL_MODULE_OWNER := samsung LOCAL_SRC_FILES := system/lib/libfimc.so diff --git a/proprietary-files.txt b/proprietary-files.txt index 5da466e..1625bb9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -20,7 +20,6 @@ system/etc/wifi/nvram_net.txt_semcosh system/lib/egl/libEGL_mali.so system/lib/egl/libGLESv1_CM_mali.so system/lib/egl/libGLESv2_mali.so -system/lib/libaudiosa.so system/lib/libcec.so system/lib/libddc.so system/lib/libedid.so @@ -33,7 +32,6 @@ system/lib/libMcClient.so system/lib/libMcRegistry.so system/lib/libMcVersion.so system/lib/libsecnativefeature.so -system/lib/libUMP.so system/usr/idc/melfas_ts.idc system/usr/idc/sec_touchscreen.idc system/usr/keylayout/gpio-keys.kl @@ -52,8 +50,6 @@ system/vendor/firmware/SlimISP_ZH.bin system/vendor/firmware/SlimISP_ZK.bin system/vendor/firmware/SlimISP_ZM.bin system/vendor/lib/drm/libdrmwvmplugin.so -system/vendor/lib/liblvverx.so -system/vendor/lib/liblvvetx.so system/vendor/lib/libwvdrm_L1.so system/vendor/lib/libwvm.so system/vendor/lib/libWVStreamControlAPI_L1.so |