diff --git a/Android.mk b/Android.mk index 6ae8ad8..31dda08 100644 --- a/Android.mk +++ b/Android.mk @@ -24,10 +24,10 @@ FIRMWARE_ADSP_IMAGES := \ FIRMWARE_ADSP_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(FIRMWARE_MODEM_IMAGES))) $(FIRMWARE_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "ADSP Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "ADSP Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_ADSP_SYMLINKS) @@ -36,10 +36,10 @@ FIRMWARE_CPPF_IMAGES := \ FIRMWARE_CPPF_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(FIRMWARE_CPPF_IMAGES))) $(FIRMWARE_CPPF_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Fingerprint Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "Fingerprint Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_CPPF_SYMLINKS) @@ -50,10 +50,10 @@ FIRMWARE_FINGERPRINT_IMAGES := \ FIRMWARE_FINGERPRINT_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(FIRMWARE_FINGERPRINT_IMAGES))) $(FIRMWARE_FINGERPRINT_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Fingerprint Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "Fingerprint Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_FINGERPRINT_SYMLINKS) @@ -65,10 +65,10 @@ FIRMWARE_MODEM_IMAGES := \ FIRMWARE_MODEM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(FIRMWARE_MODEM_IMAGES))) $(FIRMWARE_MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Modem Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "Modem Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MODEM_SYMLINKS) @@ -78,10 +78,10 @@ FIRMWARE_WCNSS_IMAGES := \ FIRMWARE_WCNSS_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(FIRMWARE_WCNSS_IMAGES))) $(FIRMWARE_WCNSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "WCNSS Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "WCNSS Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WCNSS_SYMLINKS) @@ -91,10 +91,10 @@ FIRMWARE_WIDEVINE_IMAGES := \ FIRMWARE_WIDEVINE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(FIRMWARE_WIDEVINE_IMAGES))) $(FIRMWARE_WIDEVINE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Widevine Firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + @echo "Widevine Firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WIDEVINE_SYMLINKS) diff --git a/cmactions/res/values/array.xml b/cmactions/res/values/array.xml index 71e452b..81de82a 100644 --- a/cmactions/res/values/array.xml +++ b/cmactions/res/values/array.xml @@ -16,7 +16,7 @@ --> - None + None Home Power Back @@ -26,7 +26,7 @@ - 0 + 0 102 116 158 diff --git a/configs/gps/flp.conf b/configs/gps/flp.conf deleted file mode 100644 index 7d6002f..0000000 --- a/configs/gps/flp.conf +++ /dev/null @@ -1,60 +0,0 @@ -################################### -##### FLP settings ##### -################################### - -################################### -# FLP BATCHING SIZE -################################### -# The number of batched locations -# requested to modem. The desired number -# defined below may not be satisfied, as -# the modem can only return the number -# of batched locations that can be allocated, -# which is limited by memory. The default -# batch size defined as 20 as below. -BATCH_SIZE=20 - -################################### -# FLP BATCHING SESSION TIMEOUT -################################### -# Duration with which batch session timeout -# happens in milliseconds. If not specified -# or set to zero, batching session timeout -# defaults to 20 seconds by the modem. -# BATCH_SESSION_TIMEOUT=20000 - -################################### -# FLP CAPABILITIES BIT MASK -################################### -# GEOFENCE = 0x01 -# BATCHING = 0x02 -# default = GEOFENCE | BATCHING -CAPABILITIES=0x03 - -################################### -# FLP BATCHING ACCURACY -################################### -# Set to one of the defined values below -# to define the accuracy of batching. -# If not specified, accuracy defaults -# to LOW. -# FLP BATCHING ACCURACY values: -# Low accuracy = 0 -# Medium accuracy = 1 -# High accuracy = 2 -ACCURACY=0 - -################################### -# FLP GEOFENCE RESPONSIVENESS -################################### -# If set to one of the defined values below, -# it will override the responsiveness for -# FLP geofence, which implements the fused -# location API. If not set to a value defined -# below, which is default, it will not -# override the responsivness. -# FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE Values: -# 1: LOW responsiveness -# 2: MEDIUM responsiveness -# 3: HIGH responsiveness -FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE = 0 diff --git a/configs/gps/gps.conf b/configs/gps/gps.conf deleted file mode 100644 index 149adcb..0000000 --- a/configs/gps/gps.conf +++ /dev/null @@ -1,88 +0,0 @@ -#gps_conf_from_sim.conf - -#XTRA_SERVER_1=https://xtrapath2.izatcloud.net/xtra2.bin -#XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra2.bin -#XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra2.bin - -# _SET = 1 -# _CLEAR = 0 -ERR_ESTIMATE=0 - -#Test -#NTP_SERVER=time.gpsonextra.net -#Asia -# NTP_SERVER=asia.pool.ntp.org -#Europe -# NTP_SERVER=europe.pool.ntp.org -#North America -#NTP_SERVER=north-america.pool.ntp.org - -# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info -# 4 - Debug, 5 - Verbose -# If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 2 - -# Intermediate position report, 1=enable, 0=disable -#INTERMEDIATE_POS=0 - -# supl version 1.0 -#5UPL_VER=0x20000 - -# Emergency SUPL, 1=enable, 0=disable -#SUPL_ES=0 - -# SUPL Mode (0=Standalone, 1=MSB, 2=MSA) -#SUPL_MODE=1 - -# GPS Capabilities bit mask -# SCHEDULING = 0x01 -# MSB = 0x02 -# MSA = 0x04 -# ON_DEMAND_TIME = 0x10 -# GEOFENCE = 0x20 -# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE -CAPABILITIES=0x37 - -# Accuracy threshold for intermediate positions -# less accurate positions are ignored, 0 for passing all positions -# ACCURACY_THRES=5000 - -################################ -##### AGPS server settings ##### -################################ - -# FOR SUPL SUPPORT, set the following -# SUPL_HOST=supl.host.com or IP -# SUPL_PORT=1234 - -# FOR C2K PDE SUPPORT, set the following -# C2K_HOST=c2k.pde.com or IP -# C2K_PORT=1234 - -#################################### -# LTE Positioning Profile Settings -#################################### -# 0: Enable RRLP on LTE(Default) -# 1: Enable LPP_User_Plane on LTE -# 2: Enable LPP_Control_Plane -# 3: Enable both LPP_User_Plane and LPP_Control_Plane -#LPP_PROFILE = 0 - -################################ -# EXTRA SETTINGS -################################ -# NMEA provider (1=Modem Processor, 0=Application Processor) -#NMEA_PROVIDER=0 -# Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE) -#SGLTE_TARGET=0 - -################################################## -# Select Positioning Protocol on A-GLONASS system -################################################## -# 0x1: RRC CPlane -# 0x2: RRLP UPlane -# 0x4: LLP Uplane -#A_GLONASS_POS_PROTOCOL_SELECT = 0 - -#XTRA CA path -XTRA_CA_PATH=/system/etc/security/cacerts diff --git a/configs/gps/izat.conf b/configs/gps/izat.conf deleted file mode 100644 index 1451f08..0000000 --- a/configs/gps/izat.conf +++ /dev/null @@ -1,213 +0,0 @@ -######################################### -# Log verbosity control for izat modules -######################################### -# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5 -IZAT_DEBUG_LEVEL = 2 - -################################################## -# Select WIFI Wait Timeout value in seconds for SUPL -################################################## -WIFI_WAIT_TIMEOUT_SELECT = 0 - -################################ -# NLP Settings -################################ -# NLP_MODE 1: OSNLP Only, 2: QNP Only, 3: Combo, 4: QNP preferred -# NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode -# to determine how much Tolerance for first position -# NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode -# to determine how much Tolerance for positions after first -# NLP_THRESHOLD: Sets how many failures needed before -# switching preferred NLP in Combo mode -# NLP_ACCURACY_MULTIPLE: Determines how far off the accuracy -# must be, in multiples, between two NLP location reports to -# be considered much worse accuracy. Used in switching logic -# NLP COMBO MODE USES QNP WITH NO EULA CONSENT: Determines -# whether or not to still send network location requests to -# QNP when the EULA is not consented to by the user. QNP can -# still return ZPP locations or injected locations even -# without EULA consent, but the uncertainty can be high. -# QNP preferred mode prefers QNP when there is EULA consent, -# otherwise OSNLP is used. -NLP_MODE = 1 -NLP_MODE_EMERGENCY = 1 -NLP_TOLERANCE_TIME_FIRST = 5000 -NLP_TOLERANCE_TIME_AFTER = 20000 -NLP_THRESHOLD = 3 -NLP_ACCURACY_MULTIPLE = 2 -NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1 -OSNLP_PACKAGE = com.google.android.gms -OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider - -# Threshold period for ZPP triggers -ZPP_TRIGGER_THRESHOLD=2147483647 - -################################### -# GEOFENCE SERVICES -################################### -# If set to one of the defined values below, it will override -# the responsiveness for geofence services, which implements -# the Proximity Alert API. If not set to a value defined below, -# which is default, it will not override the responsivness. -# The geofence HAL API is unaffected by this value. -# GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE Values: -# 1: LOW responsiveness -# 2: MEDIUM responsiveness -# 3: HIGH responsiveness -GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE = 0 - -##################################### -# IZAT PREMIUM FEATURE SETTINGS -##################################### -#Possible states of a feature: -#DISABLED -#BASIC -#PREMIUM - -#GTP_CELL_PROC valid options: -# AP -# MODEM -GTP_CELL_PROC=MODEM - -#GTP_CELL valid modes: -# DISABLED -# BASIC -GTP_CELL=DISABLED - -#GTP_WIFI valid modes: -# DISABLED -# BASIC -GTP_WIFI=DISABLED - -#GTP_WAA valid modes: -# DISABLED -# BASIC -GTP_WAA=DISABLED - -#SAP valid modes: -# DISABLED -# BASIC -# PREMIUM -SAP=DISABLED - -#ODCPI valid modes: -#DISABLED -#BASIC -ODCPI=BASIC - -#FREE_WIFI_SCAN_INJECT valid modes: -#DISABLED -#BASIC -FREE_WIFI_SCAN_INJECT=DISABLED - -#SUPL_WIFI valid modes: -#DISABLED -#BASIC -SUPL_WIFI=DISABLED - -#WIFI_SUPPLICANT_INFO valid modes: -#DISABLED -#BASIC -WIFI_SUPPLICANT_INFO=DISABLED - -##################################### -# Location process launcher settings -##################################### -# DO NOT MODIFY -# Modifying below attributes without -# caution can have serious implications. - -#Values for PROCESS_STATE: -# ENABLED -# DISABLED - -#FEATURE MASKS: -# GTP-WIFI 0X03 -# GTP-AP-CELL 0X0c -# GTP-MP-CELL 0xc00 -# GTP-WAA 0X300 -# SAP 0Xc0 -# ODCPI 0x1000 -# FREE_WIFI_SCAN_INJECT 0x2000 -# SUPL_WIFI 0x4000 -# WIFI_SUPPLICANT_INFO 0x8000 - -#Values for PLATFORMS can be: -#1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226 -#2. 'all' or 'all exclude' -> for All platforms -#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937 - -#Values for BASEBAND can be: -#1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2 -#2. 'all' or 'all exclude' -> for all basebands -#3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte - -#Valyes for LEAN_TARGETS can be: -#ENABLED -> if this process is supposed to run on lean and mean targets -#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 net_raw -PREMIUM_FEATURE=0 -IZAT_FEATURE_MASK=0 -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=automotive - -PROCESS_NAME=/system/bin/gpsone_daemon -PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED -PROCESS_GROUPS=inet net_raw -PREMIUM_FEATURE=0 -IZAT_FEATURE_MASK=0 -PLATFORMS=msm7630_fusion -BASEBAND=svlte2a sglte sglte2 -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - -PROCESS_NAME=/system/bin/lowi-server -PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED -PROCESS_GROUPS=gps net_admin wifi inet qcom_diag net_raw -PREMIUM_FEATURE=0 -IZAT_FEATURE_MASK=0xf303 -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - -PROCESS_NAME=/system/bin/xtwifi-inet-agent -PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED -PROCESS_GROUPS=inet gps -PREMIUM_FEATURE=1 -IZAT_FEATURE_MASK=0xc0f -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - -PROCESS_NAME=/system/bin/xtwifi-client -PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED -PROCESS_GROUPS=net_admin wifi inet gps net_raw rfs_shared -PREMIUM_FEATURE=1 -IZAT_FEATURE_MASK=0xf0f -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - -PROCESS_NAME=/system/vendor/bin/slim_daemon -PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED -PROCESS_GROUPS=gps net_raw qcom_diag -PREMIUM_FEATURE=1 -IZAT_FEATURE_MASK=0xf0 -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - diff --git a/configs/gps/sap.conf b/configs/gps/sap.conf deleted file mode 100644 index 35426da..0000000 --- a/configs/gps/sap.conf +++ /dev/null @@ -1,53 +0,0 @@ -################################ -# Sensor Settings -################################ -#The following parameters are optional. -#Internal defaults support MEMS sensors -#native to most handset devices. -#Device specific sensor characterization -#for improved performance is possible as -#described in SAP application notes. -#GYRO_BIAS_RANDOM_WALK= -#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY= -#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY= -#RATE_RANDOM_WALK_SPECTRAL_DENSITY= -#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY= - -# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0) -# used in loc_eng_reinit -SENSOR_ACCEL_BATCHES_PER_SEC=2 -SENSOR_ACCEL_SAMPLES_PER_BATCH=5 -SENSOR_GYRO_BATCHES_PER_SEC=2 -SENSOR_GYRO_SAMPLES_PER_BATCH=5 -# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0) -SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4 -SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25 -SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4 -SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25 - -# Sensor Control Mode (0=AUTO, 1=FORCE_ON) -# used in loc_eng_reinit -SENSOR_CONTROL_MODE=0 - -# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable) -# used in loc_eng_reinit -SENSOR_USAGE=1 - -# Choose GSIFF sensor provider (1=Snapdragon Sensors Core, 2=Android NDK) -SENSOR_PROVIDER=1 - -# Bit mask used to define which sensor algorithms are used. -# Setting each bit has the following definition: -# 0x1 - DISABLE_INS_POSITIONING_FILTER -# 0x0 - ENABLE_INS_POSITIONING_FILTER -SENSOR_ALGORITHM_CONFIG_MASK=0x1 - -# Time source used by Sensor HAL -# Setting this value controls accuracy of location sensor services. -# 0 - Unknown -# 1 - CLOCK_BOOTTIME -# 2 - CLOCK_MONOTONIC -# 3 - CLOCK_REALTIME -# 4 - CLOCK_BOOTTIME using Alarm timer interface -NDK_PROVIDER_TIME_SOURCE=1 - diff --git a/configs/gps/xtwifi.conf b/configs/gps/xtwifi.conf deleted file mode 100644 index fc17faa..0000000 --- a/configs/gps/xtwifi.conf +++ /dev/null @@ -1,82 +0,0 @@ -#GTP AP Project client core config file -# -#GENERAL DESCRIPTION -#This is used by client core -# -#Copyright (c) 2012-2014 Qualcomm Atheros, Inc. -#All Rights Reserved. -#Qualcomm Atheros Confidential and Proprietary. - -# Log verbosity control for most of the GTP WiFi system, including native and -# Java componenets -# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5, ALL = 100 -DEBUG_GLOBAL_LOG_LEVEL = 2 - -# this is used at the server side to distinguish uploads from different maker/model -# default "Qualcomm" -OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm" - -# this is used at the server side to distinguish uploads from different maker/model -# default "UNKNOWN" -MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN" - -############################################################################## -# GTP-WiFi positioning config # -############################################################################## - -# URL for the server position request -XT_SERVER_ROOT_URL = https://gtpa1.izatcloud.net:443/uds/v2 - -# size, in bytes, of the cache on device -SIZE_BYTE_TOTAL_CACHE = 5000000 - -# value 0: (default) use the async LOWI wifi scanner -# value 10: FAKE AP wifi scanner -WIFI_SCANNER_CHOICE = 0 - -############################################################################## -# XT-WiFi crowd sourcing config # -############################################################################## -# Use server suggestion for crowd sourcing configuration -ENABLE_SERVER_SUGGESTION_FOR_CROWD_SOURCING = 1 - -# Maximum number of APs to be collected for upload -NUM_MAX_AP_PER_UPLOAD = 16383 -# Number of minutes between upload: 24 hours -INTERVAL_MIN_UPLOAD = 1440 -# Number of minutes between forced upload: 5 days -INTERVAL_MIN_FORCED_UPLOAD = 7200 - -# The minimum time between two collected AP data sets in seconds -INTERVAL_SEC_AP_SETS_COLLECT = 10 -# Timeout for scan interval when phone is on: 600 seconds (10 minute) -INTERVAL_SEC_SCAN = 600 -# Timeout for scan interval when phone has not continusouly on for INTERVAL_MIN_SCAN -INTERVAL_MIN_FORCED_SCAN = 480 - -# Maximum number of Cell DB records for upload -WWAN_MAX_CELLDB_RECORDS_PER_UPLOAD = 1000 - -############################################################################## -# GTP AP cell config # -############################################################################## -# This item specifies the RIL server name. -# This configure item can not be removed in Android target. -XTRAT_WWAN_LITE_LOC_RIL_SERVER_NAME = "OS-Agent" - -# Maximum total number of SNA records cached in mobile storage. -# Max allowed value is 10000 -# Min value is 100 -XTRAT_WWAN_LITE_MAX_DL_SNA = 10000 - -# Maximum total number of BSA records cached in mobile storage. -# Max allowed value is 65000 -# Min value is 100 -XTRAT_WWAN_LITE_MAX_DL_BSA = 65000 - -############################################################################## -# Qualcomm Network Location Provider config # -############################################################################## -# Accuracy Threshold for NLP position. Position exceeds thsi threshold will be filtered out. -# Default is 25000 meters. -LARGE_ACCURACY_THRESHOLD_TO_FILTER_NLP_POSITION = 25000 \ No newline at end of file diff --git a/device.mk b/device.mk index 7fc3878..fc869c2 100644 --- a/device.mk +++ b/device.mk @@ -153,10 +153,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fs_config_files -# GPS -#PRODUCT_PACKAGES += \ -# gps.msm8916 - # IMS PRODUCT_PACKAGES += \ libshim_ims @@ -300,6 +296,3 @@ PRODUCT_COPY_FILES += \ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 PRODUCT_GMS_CLIENTID_BASE := android-motorola - -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -$(call inherit-product, vendor/cm/config/common_full_phone.mk) diff --git a/full_potter.mk b/full_potter.mk index 2521968..92e7f78 100644 --- a/full_potter.mk +++ b/full_potter.mk @@ -20,5 +20,3 @@ $(call inherit-product, device/motorola/potter/device.mk) # Device identifier. This must come after all inclusions PRODUCT_DEVICE := potter PRODUCT_NAME := full_potter - -$(call inherit-product-if-exists, vendor/motorola/potter/potter-vendor.mk) \ No newline at end of file diff --git a/lineage.mk b/lineage.mk index 2cf6374..bd474a6 100644 --- a/lineage.mk +++ b/lineage.mk @@ -14,7 +14,16 @@ # See the License for the specific language governing permissions and # limitations under the License. + +# Inherit from those products. Most specific first. $(call inherit-product, device/motorola/potter/full_potter.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) + +# for specific +$(call inherit-product, vendor/motorola/potter/potter-vendor.mk) + +# Inherit some common CM stuff. +$(call inherit-product, vendor/cm/config/common_full_phone.mk) # Boot animation TARGET_SCREEN_WIDTH := 1080