Merge remote-tracking branch 'origin/lineage-19.1' into HEAD (fc63e912) · Commits · e / os / android_vendor_lineage

config/BoardConfigQcom.mk

+30 −6

Original line number	Diff line number	Diff line
		@@ -12,21 +12,39 @@ HOLI := holi #SM4350
		B_FAMILY := msm8226 msm8610 msm8974
		B64_FAMILY := msm8992 msm8994
		BR_FAMILY := msm8909 msm8916
		UM_3_18_FAMILY := msm8937 msm8996
		UM_4_4_FAMILY := msm8998 sdm660
		UM_3_18_FAMILY := msm8996
		UM_4_4_FAMILY := msm8998
		UM_4_9_FAMILY := sdm845 sdm710
		UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
		UM_4_19_FAMILY := $(KONA) $(LITO) $(BENGAL)
		UM_5_4_FAMILY := $(LAHAINA) $(HOLI)
		UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
		QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)

		ifeq (,$(TARGET_ENFORCES_QSSI))
		UM_3_18_FAMILY += msm8953
		UM_3_18_FAMILY += msm8937 msm8953
		UM_4_4_FAMILY += sdm660
		else
		QSSI_SUPPORTED_PLATFORMS += msm8953
		UM_4_9_LEGACY_FAMILY := msm8937 msm8953
		UM_4_19_LEGACY_FAMILY := sdm660
		endif

		UM_PLATFORMS := \
		$(UM_3_18_FAMILY) \
		$(UM_4_9_LEGACY_FAMILY) \
		$(UM_4_4_FAMILY) \
		$(UM_4_19_LEGACY_FAMILY) \
		$(UM_4_9_FAMILY) \
		$(UM_4_14_FAMILY) \
		$(UM_4_19_FAMILY) \
		$(UM_5_4_FAMILY)

		QSSI_SUPPORTED_PLATFORMS := \
		$(UM_4_9_LEGACY_FAMILY) \
		$(UM_4_19_LEGACY_FAMILY) \
		$(UM_4_9_FAMILY) \
		$(UM_4_14_FAMILY) \
		$(UM_4_19_FAMILY) \
		$(UM_5_4_FAMILY)

		BOARD_USES_ADRENO := true

		# Add qtidisplay to soong config namespaces
		@@ -120,9 +138,15 @@ else ifneq ($(filter $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		else ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
		QCOM_HARDWARE_VARIANT := msm8996
		else ifneq ($(filter $(UM_4_9_LEGACY_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		MSM_VIDC_TARGET_LIST := $(UM_4_9_LEGACY_FAMILY)
		QCOM_HARDWARE_VARIANT := msm8953
		else ifneq ($(filter $(UM_4_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
		QCOM_HARDWARE_VARIANT := msm8998
		else ifneq ($(filter $(UM_4_19_LEGACY_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		MSM_VIDC_TARGET_LIST := $(UM_4_19_LEGACY_FAMILY)
		QCOM_HARDWARE_VARIANT := sdm660
		else ifneq ($(filter $(UM_4_9_FAMILY),$(TARGET_BOARD_PLATFORM)),)
		MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
		QCOM_HARDWARE_VARIANT := sdm845

config/common.mk

+0 −12

Original line number	Diff line number	Diff line
		@@ -78,12 +78,6 @@ PRODUCT_COPY_FILES += \
		PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
		ro.control_privapp_permissions=enforce

		# Include AOSP audio files
		include vendor/lineage/config/aosp_audio.mk

		# Include Lineage audio files
		include vendor/lineage/config/lineage_audio.mk

		ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)
		# Lineage SDK
		include vendor/lineage/config/lineage_sdk_common.mk
		@@ -116,12 +110,6 @@ PRODUCT_PACKAGES += \
		PRODUCT_COPY_FILES += \
		vendor/lineage/prebuilt/common/etc/init/init.lineage-updater.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-updater.rc

		# Themes
		PRODUCT_PACKAGES += \
		LineageBlackTheme \
		LineageThemesStub \
		ThemePicker

		# Config
		PRODUCT_PACKAGES += \
		SimpleDeviceConfig

config/common_mobile.mk

+12 −0

Original line number	Diff line number	Diff line
		# Inherit common mobile Lineage stuff
		$(call inherit-product, vendor/lineage/config/common.mk)

		# Include AOSP audio files
		include vendor/lineage/config/aosp_audio.mk

		# Include Lineage audio files
		include vendor/lineage/config/lineage_audio.mk

		# Apps
		PRODUCT_PACKAGES += \
		Backgrounds \
		@@ -59,5 +65,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
		PRODUCT_PACKAGES += \
		QuickAccessWallet

		# Themes
		PRODUCT_PACKAGES += \
		LineageBlackTheme \
		LineageThemesStub \
		ThemePicker

		# Include configuration for eos
		$(call inherit-product, vendor/eos/config/common_mobile.mk)

tools/custom_apns.py

+8 −9

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		# limitations under the License.
		#

		import re
		import sys
		from xml.dom.minidom import parseString

		def main(argv):
		reload(sys)
		@@ -29,26 +29,25 @@ def main(argv):
		else:
		raise ValueError("Wrong number of arguments %s" % len(argv))

		custom_apn_names = []
		custom_apn_names = set()
		with open(custom_override_file, 'r') as f:
		for line in f:
		xmltree = parseString(line)
		carrier = xmltree.getElementsByTagName('apn')[0].getAttribute('carrier')
		custom_apn_names.append('"' + carrier + '"')
		custom_apn_names.add(re.search(r'carrier="[^"]+"', line).group(0))

		with open(original_file, 'r') as input_file:
		with open(output_file_path, 'w') as output_file:
		for line in input_file:
		writeOriginalLine = True
		found_custom_apns = set()
		for apn in custom_apn_names:
		if apn in line:
		with open(custom_override_file, 'r') as custom_file:
		for override_line in custom_file:
		if apn in override_line:
		output_file.write(override_line)
		writeOriginalLine = False
		custom_apn_names.remove(apn)
		if writeOriginalLine:
		found_custom_apns.add(apn)
		if found_custom_apns:
		custom_apn_names -= found_custom_apns
		else:
		if "</apns>" in line:
		if custom_apn_names:
		for apn in custom_apn_names: