Initial unified commit for Android 12, syncing up to v400.a
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
From 3b33cbc0f0f6642bcb609a3d88e516452147debe Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Mon, 5 Oct 2020 01:51:46 +0000
|
||||
Subject: [PATCH] build: Don't handle apns-conf
|
||||
|
||||
Leave it to vendor/lineage instead
|
||||
|
||||
Change-Id: I51fb1436ee0ee2e33b20ca0810b69e827f3f34dc
|
||||
---
|
||||
target/product/aosp_product.mk | 7 -------
|
||||
target/product/full_base_telephony.mk | 5 -----
|
||||
2 files changed, 12 deletions(-)
|
||||
|
||||
diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
|
||||
index b41c35fb7..bdaa57aac 100644
|
||||
--- a/target/product/aosp_product.mk
|
||||
+++ b/target/product/aosp_product.mk
|
||||
@@ -37,10 +37,3 @@ PRODUCT_PACKAGES += \
|
||||
PhotoTable \
|
||||
preinstalled-packages-platform-aosp-product.xml \
|
||||
WallpaperPicker \
|
||||
-
|
||||
-# Telephony:
|
||||
-# Provide a APN configuration to GSI product
|
||||
-ifeq ($(LINEAGE_BUILD),)
|
||||
-PRODUCT_COPY_FILES += \
|
||||
- device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
|
||||
-endif
|
||||
diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
|
||||
index e4f5a162b..5470ad2be 100644
|
||||
--- a/target/product/full_base_telephony.mk
|
||||
+++ b/target/product/full_base_telephony.mk
|
||||
@@ -26,10 +26,5 @@ PRODUCT_VENDOR_PROPERTIES := \
|
||||
PRODUCT_COPY_FILES := \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
||||
|
||||
-ifeq ($(LINEAGE_BUILD),)
|
||||
-PRODUCT_COPY_FILES += \
|
||||
- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
|
||||
-endif
|
||||
-
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user