StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apns: Remove support for CUSTOM_APNS_FILE

Browse Source 
Change-Id: I5329ba5adb83c8c4d3206ed71a29dc6ea058c4b1
This commit is contained in:
Sebastiano Barezzi
2024-07-22 12:11:40 +02:00
committed by LuK1337
parent cb619b5b04
commit 11faaafa7c
2 changed files with 1 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
prebuilt/common/Android.mk
View File

@@ -2,29 +2,12 @@ LOCAL_PATH := $(call my-dir)
################################
# Copies the APN list file into $(TARGET_COPY_OUT_PRODUCT)/etc for the product as apns-conf.xml.
# In the case where $(CUSTOM_APNS_FILE) is defined, the content of $(CUSTOM_APNS_FILE)
# is added or replaced to the $(DEFAULT_APNS_FILE).
include $(CLEAR_VARS)
LOCAL_MODULE := apns-conf.xml
LOCAL_MODULE_CLASS := ETC
DEFAULT_APNS_FILE := vendor/lineage/prebuilt/common/etc/apns-conf.xml
ifdef CUSTOM_APNS_FILE
CUSTOM_APNS_SCRIPT := vendor/lineage/tools/custom_apns.py
FINAL_APNS_FILE := $(local-generated-sources-dir)/apns-conf.xml
$(FINAL_APNS_FILE): PRIVATE_SCRIPT := $(CUSTOM_APNS_SCRIPT)
$(FINAL_APNS_FILE): PRIVATE_CUSTOM_APNS_FILE := $(CUSTOM_APNS_FILE)
$(FINAL_APNS_FILE): $(CUSTOM_APNS_SCRIPT) $(DEFAULT_APNS_FILE)
rm -f $@
python $(PRIVATE_SCRIPT) $@ $(PRIVATE_CUSTOM_APNS_FILE)
else
FINAL_APNS_FILE := $(DEFAULT_APNS_FILE)
endif
LOCAL_PREBUILT_MODULE_FILE := $(FINAL_APNS_FILE)
LOCAL_PREBUILT_MODULE_FILE := vendor/lineage/prebuilt/common/etc/apns-conf.xml
LOCAL_PRODUCT_MODULE := true

61
tools/custom_apns.py
View File

@@ -1,61 +0,0 @@
#!/usr/bin/env python3
#
# Copyright (C) 2018 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import re
import sys
from importlib import reload
def main(argv):
reload(sys)
original_file = 'vendor/lineage/prebuilt/common/etc/apns-conf.xml'
if len(argv) == 3:
output_file_path = argv[1]
custom_override_file = argv[2]
else:
raise ValueError("Wrong number of arguments %s" % len(argv))
custom_apn_names = set()
with open(custom_override_file, 'r') as f:
for line in f:
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:
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)
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:
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)
output_file.write(line)
if __name__ == '__main__':
main(sys.argv)