From ec9758c57d4a2b0f615a1729f29e4f952eaf5131 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 25 Jun 2016 00:50:33 +0100 Subject: z2_plus: Enable QC location services * This is a dependency for DPM on the new blobs Change-Id: I000ac5722ea7087a6ab1f88ad205542382e3527c --- gps/etc/izat.conf | 8 +- .../frameworks/base/core/res/res/values/config.xml | 10 ++- setup-makefiles.sh | 89 ++++++++++++++++++++++ 3 files changed, 101 insertions(+), 6 deletions(-) diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf index 93d9501..17098a2 100644 --- a/gps/etc/izat.conf +++ b/gps/etc/izat.conf @@ -168,8 +168,8 @@ HARDWARE_TYPE=automotive #DISABLED -> if this process is to be disabled on lean and mean targets PROCESS_NAME=/system/bin/garden_app PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1 -PROCESS_STATE=ENABLED -PROCESS_GROUPS=gps +PROCESS_STATE=DISABLED +PROCESS_GROUPS=gps net_raw PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0 PLATFORMS=all @@ -190,8 +190,8 @@ HARDWARE_TYPE=all PROCESS_NAME=/system/bin/lowi-server PROCESS_ARGUMENT= -PROCESS_STATE=ENABLED -PROCESS_GROUPS=gps net_admin wifi inet qcom_diag +PROCESS_STATE=DISABLED +PROCESS_GROUPS=gps net_admin wifi inet qcom_diag net_raw PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0xf303 PLATFORMS=all diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 5f1af24..1b312be 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -481,11 +481,17 @@ NOTE: This requires additional hardware-specific code. --> - "/system/framework/arm64/boot-framework.oat" "/system/framework/oat/arm64/services.odex" "/system/framework/arm64/boot.oat" "/system/framework/arm64/boot-core-libart.oat" - + + + false + false + com.qualcomm.location + com.qualcomm.location + com.qualcomm.location +/resources> diff --git a/setup-makefiles.sh b/setup-makefiles.sh index aabf435..a0e6e50 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -33,10 +33,19 @@ CM_ROOT="$MY_DIR"/../../.. printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK" printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$ANDROIDMK" +<<<<<<< HEAD # Qualcomm performance blobs - conditional as well # in order to support LineageOS builds cat << EOF >> "$PRODUCTMK" endif +======= +PRODUCT_PACKAGES += \\ + CNEService \\ + com.qualcomm.location \\ + dpmserviceapp \\ + qcrilmsgtunnel \\ + QtiTetherService +>>>>>>> 05c9d04... gemini: Enable QC location services -include vendor/extra/devices.mk ifneq (\$(call is-qc-perf-target),true) @@ -139,6 +148,86 @@ LOCAL_MULTILIB := both include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) +<<<<<<< HEAD +======= +LOCAL_MODULE := CNEService +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PRIVILEGED_MODULE := true +LOCAL_SRC_FILES := proprietary/priv-app/CNEService/CNEService.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := com.qualcomm.location +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PRIVILEGED_MODULE := true +LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := dpmserviceapp +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PRIVILEGED_MODULE := true +LOCAL_SRC_FILES := proprietary/priv-app/dpmserviceapp/dpmserviceapp.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := qcrilmsgtunnel +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PRIVILEGED_MODULE := true +LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := QtiTetherService +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PRIVILEGED_MODULE := true +LOCAL_SRC_FILES := proprietary/priv-app/QtiTetherService/QtiTetherService.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := ims +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true +LOCAL_SRC_FILES := proprietary/vendor/app/ims/ims.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +LOCAL_MODULE := imssettings +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_OWNER := $VENDOR +LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true +LOCAL_SRC_FILES := proprietary/vendor/app/imssettings/imssettings.apk +LOCAL_CERTIFICATE := platform +include \$(BUILD_PREBUILT) + +include \$(CLEAR_VARS) +>>>>>>> 05c9d04... gemini: Enable QC location services LOCAL_MODULE := libTimeService LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_OWNER := $VENDOR -- cgit v1.2.3