From 4a6e93e5bd7adf9790bb1cff7df6ccf4ec54290f Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Tue, 14 Jul 2015 00:33:17 -0700 Subject: [PATCH] crackling: Update QMI packages Change-Id: I2bb886606a74f0496f9b5974d8183e72568f67f6 --- proprietary-files-qc.txt | 30 ++++----- setup-makefiles.sh | 142 +++++++++++++++++++++++++++++++++++---- 2 files changed, 144 insertions(+), 28 deletions(-) diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt index d68a161..7f574af 100644 --- a/proprietary-files-qc.txt +++ b/proprietary-files-qc.txt @@ -220,35 +220,35 @@ bin/vm_bms # Qualcomm framework bin/irsc_util -vendor/lib64/libdiag.so +-vendor/lib64/libdiag.so vendor/lib64/libdsi_netctrl.so -vendor/lib64/libdsutils.so -vendor/lib64/libidl.so -vendor/lib64/libqcci_legacy.so +-vendor/lib64/libdsutils.so +-vendor/lib64/libidl.so +-vendor/lib64/libqcci_legacy.so vendor/lib64/libqdi.so vendor/lib64/libqdp.so vendor/lib64/libqmi_cci.so -vendor/lib64/libqmi_client_qmux.so +-vendor/lib64/libqmi_client_qmux.so vendor/lib64/libqmi_common_so.so vendor/lib64/libqmi_csi.so vendor/lib64/libqmi_encdec.so -vendor/lib64/libqmiservices.so -vendor/lib64/libqmi.so +-vendor/lib64/libqmiservices.so +-vendor/lib64/libqmi.so vendor/lib64/libsmemlog.so -vendor/lib/libdiag.so +-vendor/lib/libdiag.so vendor/lib/libdsi_netctrl.so -vendor/lib/libdsutils.so -vendor/lib/libidl.so -vendor/lib/libqcci_legacy.so +-vendor/lib/libdsutils.so +-vendor/lib/libidl.so +-vendor/lib/libqcci_legacy.so vendor/lib/libqdi.so vendor/lib/libqdp.so vendor/lib/libqmi_cci.so -vendor/lib/libqmi_client_qmux.so +-vendor/lib/libqmi_client_qmux.so vendor/lib/libqmi_common_so.so vendor/lib/libqmi_csi.so vendor/lib/libqmi_encdec.so -vendor/lib/libqmiservices.so -vendor/lib/libqmi.so +-vendor/lib/libqmiservices.so +-vendor/lib/libqmi.so vendor/lib/libsmemlog.so # Radio @@ -266,7 +266,7 @@ etc/permissions/qcrilhook.xml lib64/librmnetctl.so vendor/lib64/libcneapiclient.so vendor/lib64/libconfigdb.so -vendor/lib64/libmdmdetect.so +-vendor/lib64/libmdmdetect.so vendor/lib64/libnetmgr.so vendor/lib64/libperipheral_client.so vendor/lib64/libril-qc-qmi-1.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index b0a8805..a86ead6 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -114,10 +114,24 @@ PRODUCT_PACKAGES += \\ libloc_api_v02 \\ libloc_ds_api +PRODUCT_PACKAGES += \\ + libdiag \\ + libdsutils \\ + libidl \\ + libmdmdetect \\ + libqcci_legacy \\ + libqmi \\ + libqmi_client_qmux \\ + libqmiservices \\ + libqmi + PRODUCT_PACKAGES += \\ libHevcSwDecoder \\ libtime_genoff +PRODUCT_PACKAGES += \\ + libwpa_qmi_eap_proxy + \$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk) EOF @@ -222,6 +236,45 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_CERTIFICATE := PRESIGNED include \$(BUILD_PREBUILT) +include \$(CLEAR_VARS) +LOCAL_MODULE := libdiag +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libdiag.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libdiag.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libdsutils +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libdsutils.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libdsutils.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libidl +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libidl.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libidl.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + include \$(CLEAR_VARS) LOCAL_MODULE := libloc_api_v02 LOCAL_MODULE_OWNER := $VENDOR @@ -261,40 +314,103 @@ LOCAL_PROPRIETARY_MODULE := true include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libtime_genoff -LOCAL_MODULE_OWNER := yu -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libtime_genoff.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libtime_genoff.so +LOCAL_MODULE := libqct_resampler +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES := proprietary/vendor/lib/libqct_resampler.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MULTILIB := both +LOCAL_MODULE_PATH := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := 32 LOCAL_PROPRIETARY_MODULE := true include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libqct_resampler +LOCAL_MODULE := libmm-abl LOCAL_MODULE_OWNER := $VENDOR -LOCAL_SRC_FILES := proprietary/vendor/lib/libqct_resampler.so +LOCAL_SRC_FILES := proprietary/vendor/lib64/libmm-abl.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_PATH := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MULTILIB := 32 +LOCAL_MULTILIB := 64 LOCAL_PROPRIETARY_MODULE := true include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libmm-abl +LOCAL_MODULE := libmdmdetect LOCAL_MODULE_OWNER := $VENDOR -LOCAL_SRC_FILES := proprietary/vendor/lib64/libmm-abl.so -LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := proprietary/vendor/lib64/libmdmdetect.so LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_PATH := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) LOCAL_MULTILIB := 64 +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libqcci_legacy +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqcci_legacy.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqcci_legacy.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libqmi +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqmi.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqmi.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libqmi_client_qmux +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqmi_client_qmux.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqmi_client_qmux.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libqmiservices +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libqmiservices.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libqmiservices.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := libtime_genoff +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libtime_genoff.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libtime_genoff.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) +LOCAL_MULTILIB := both LOCAL_PROPRIETARY_MODULE := true include \$(BUILD_PREBUILT)