Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

oneplus2: Remove few dpm blobs and sensors.hal.tof #29

Merged
merged 1 commit into from
Jun 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions oneplus2/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,26 @@ LOCAL_MODULE_CLASS := APPS
LOCAL_CERTIFICATE := platform
include $(BUILD_PREBUILT)

include $(CLEAR_VARS)
LOCAL_MODULE := com.qti.dpmframework
LOCAL_MODULE_OWNER := oneplus
LOCAL_SRC_FILES := proprietary/framework/com.qti.dpmframework.jar
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_CERTIFICATE := PRESIGNED
include $(BUILD_PREBUILT)

include $(CLEAR_VARS)
LOCAL_MODULE := dpmapi
LOCAL_MODULE_OWNER := oneplus
LOCAL_SRC_FILES := proprietary/framework/dpmapi.jar
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_CERTIFICATE := PRESIGNED
include $(BUILD_PREBUILT)

include $(CLEAR_VARS)
LOCAL_MODULE := qcnvitems
LOCAL_MODULE_OWNER := oneplus
Expand Down
8 changes: 0 additions & 8 deletions oneplus2/oneplus2-vendor-blobs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ PRODUCT_COPY_FILES += \
vendor/oneplus/oneplus2/proprietary/etc/firmware/rampatch_tlv_3.2.tlv:/system/etc/firmware/rampatch_tlv_3.2.tlv \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libbtnv.so:/system/vendor/lib/libbtnv.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libbtnv.so:/system/vendor/lib64/libbtnv.so \
vendor/oneplus/oneplus2/proprietary/bin/laser_init:/system/bin/laser_init \
vendor/oneplus/oneplus2/proprietary/bin/mm-qcamera-app:/system/bin/mm-qcamera-app \
vendor/oneplus/oneplus2/proprietary/bin/mm-qcamera-daemon:/system/bin/mm-qcamera-daemon \
vendor/oneplus/oneplus2/proprietary/lib/hw/camera.msm8994.so:/system/lib/hw/camera.msm8994.so \
Expand All @@ -61,7 +60,6 @@ PRODUCT_COPY_FILES += \
vendor/oneplus/oneplus2/proprietary/lib/libmorpho_video_refiner.so:/system/lib/libmorpho_video_refiner.so \
vendor/oneplus/oneplus2/proprietary/lib/libopcamerahw_interface.so:/system/lib/libopcamerahw_interface.so \
vendor/oneplus/oneplus2/proprietary/lib/libqomx_core.so:/system/lib/libqomx_core.so \
vendor/oneplus/oneplus2/proprietary/lib64/hw/sensors.hal.tof.so:/system/lib64/hw/sensors.hal.tof.so \
vendor/oneplus/oneplus2/proprietary/lib64/libopcamera.so:/system/lib64/libopcamera.so \
vendor/oneplus/oneplus2/proprietary/lib64/libopcameralib.so:/system/lib64/libopcameralib.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libfastcvadsp_stub.so:/system/vendor/lib/libfastcvadsp_stub.so \
Expand Down Expand Up @@ -226,21 +224,15 @@ PRODUCT_COPY_FILES += \
vendor/oneplus/oneplus2/proprietary/bin/dpmd:/system/bin/dpmd \
vendor/oneplus/oneplus2/proprietary/etc/dpm/dpm.conf:/system/etc/dpm/dpm.conf \
vendor/oneplus/oneplus2/proprietary/etc/dpm/nsrm/NsrmConfiguration.xml:/system/etc/dpm/nsrm/NsrmConfiguration.xml \
vendor/oneplus/oneplus2/proprietary/etc/permissions/com.qti.dpmframework.xml:/system/etc/permissions/com.qti.dpmframework.xml \
vendor/oneplus/oneplus2/proprietary/etc/permissions/dpmapi.xml:/system/etc/permissions/dpmapi.xml \
vendor/oneplus/oneplus2/proprietary/framework/com.qti.dpmframework.jar:/system/framework/com.qti.dpmframework.jar \
vendor/oneplus/oneplus2/proprietary/framework/dpmapi.jar:/system/framework/dpmapi.jar \
vendor/oneplus/oneplus2/proprietary/framework/tcmclient.jar:/system/framework/tcmclient.jar \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libdpmctmgr.so:/system/vendor/lib/libdpmctmgr.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libdpmfdmgr.so:/system/vendor/lib/libdpmfdmgr.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libdpmframework.so:/system/vendor/lib/libdpmframework.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libdpmnsrm.so:/system/vendor/lib/libdpmnsrm.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/libdpmtcm.so:/system/vendor/lib/libdpmtcm.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdpmctmgr.so:/system/vendor/lib64/libdpmctmgr.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdpmfdmgr.so:/system/vendor/lib64/libdpmfdmgr.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdpmframework.so:/system/vendor/lib64/libdpmframework.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdpmnsrm.so:/system/vendor/lib64/libdpmnsrm.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib64/libdpmtcm.so:/system/vendor/lib64/libdpmtcm.so \
vendor/oneplus/oneplus2/proprietary/bin/qseecomd:/system/bin/qseecomd \
vendor/oneplus/oneplus2/proprietary/vendor/lib/hw/gatekeeper.msm8994.so:/system/vendor/lib/hw/gatekeeper.msm8994.so \
vendor/oneplus/oneplus2/proprietary/vendor/lib/hw/keystore.msm8994.so:/system/vendor/lib/hw/keystore.msm8994.so \
Expand Down
4 changes: 3 additions & 1 deletion oneplus2/oneplus2-vendor.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

# Pick up overlay for features that depend on non-open-source files
PRODUCT_PACKAGES += \
CNEService
CNEService \
com.qti.dpmframework \
dpmapi

PRODUCT_PACKAGES += \
qcrilmsgtunnel \
Expand Down
Binary file removed oneplus2/proprietary/bin/laser_init
Binary file not shown.
8 changes: 0 additions & 8 deletions oneplus2/proprietary/etc/permissions/com.qti.dpmframework.xml

This file was deleted.

Binary file removed oneplus2/proprietary/framework/tcmclient.jar
Binary file not shown.
Binary file removed oneplus2/proprietary/lib64/hw/sensors.hal.tof.so
Binary file not shown.
Binary file not shown.
Binary file removed oneplus2/proprietary/vendor/lib/libdpmtcm.so
Binary file not shown.
Binary file removed oneplus2/proprietary/vendor/lib64/libdpmtcm.so
Binary file not shown.