Initial unified commit for Android 14, with TrebleDroid GSI target, syncing up to 20240208
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
From 4ec43947116f793a592988b91389132b22bf1fb2 Mon Sep 17 00:00:00 2001
|
||||
From: sooti <sooti85@gmail.com>
|
||||
Date: Tue, 12 Oct 2021 14:32:52 +0300
|
||||
Subject: [PATCH 1/4] build: remove emulator crap from GSI
|
||||
|
||||
Change-Id: Id45f3ff1d31e3d4492f956e68a1eb4b2fb82ce63
|
||||
---
|
||||
target/product/emulator_vendor.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk
|
||||
index f71b275b0e..62984253f3 100644
|
||||
--- a/target/product/emulator_vendor.mk
|
||||
+++ b/target/product/emulator_vendor.mk
|
||||
@@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \
|
||||
|
||||
DEVICE_PACKAGE_OVERLAYS := device/generic/goldfish/overlay
|
||||
|
||||
-PRODUCT_CHARACTERISTICS := emulator
|
||||
+# PRODUCT_CHARACTERISTICS := emulator
|
||||
|
||||
PRODUCT_FULL_TREBLE_OVERRIDE := true
|
||||
|
||||
@@ -48,5 +48,5 @@ PRODUCT_SYSTEM_EXT_PROPERTIES += \
|
||||
ro.com.google.locationfeatures=1
|
||||
|
||||
# disable setupwizard
|
||||
-PRODUCT_SYSTEM_EXT_PROPERTIES += \
|
||||
- ro.setupwizard.mode?=DISABLED
|
||||
+# PRODUCT_SYSTEM_EXT_PROPERTIES += \
|
||||
+# ro.setupwizard.mode?=DISABLED
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 6b27f2fd5851e7b9ac30922640b480282252a8c7 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Ponces <ponces26@gmail.com>
|
||||
Date: Mon, 18 Oct 2021 17:20:18 +0100
|
||||
Subject: [PATCH 2/4] build: Bypass vendor calls
|
||||
|
||||
Change-Id: I69830d6264356dadd7b037553a899a4eb3d211f1
|
||||
---
|
||||
target/product/aosp_arm64.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
|
||||
index 6c907db0ed..0adced1672 100644
|
||||
--- a/target/product/aosp_arm64.mk
|
||||
+++ b/target/product/aosp_arm64.mk
|
||||
@@ -54,9 +54,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor or vendor_boot image
|
||||
#
|
||||
-$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
|
||||
-$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
|
||||
+#$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
+#$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
|
||||
+#$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
|
||||
|
||||
#
|
||||
# Special settings for GSI releasing
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From 7a3067d35183c2b6ceac06dcaecd81c55bd58494 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 6 Oct 2023 19:11:22 -0400
|
||||
Subject: [PATCH 3/4] Include vndk v28 sepolicy support
|
||||
|
||||
---
|
||||
core/config.mk | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/core/config.mk b/core/config.mk
|
||||
index 8f7af0512a..f693461f61 100644
|
||||
--- a/core/config.mk
|
||||
+++ b/core/config.mk
|
||||
@@ -916,6 +916,7 @@ endif
|
||||
|
||||
# A list of SEPolicy versions, besides PLATFORM_SEPOLICY_VERSION, that the framework supports.
|
||||
PLATFORM_SEPOLICY_COMPAT_VERSIONS := \
|
||||
+ 28.0 \
|
||||
29.0 \
|
||||
30.0 \
|
||||
31.0 \
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 8c802e0a41a2a54d6ed53f3b7e60de307469f628 Mon Sep 17 00:00:00 2001
|
||||
From: Adithya R <gh0strider.2k18.reborn@gmail.com>
|
||||
Date: Thu, 18 Aug 2022 21:29:34 +0530
|
||||
Subject: [PATCH 4/4] core: sysprop: Write build display id to product prop
|
||||
|
||||
Some vendors override build id in odm or vendor, such as oplus.
|
||||
|
||||
Change-Id: I1c2de43ba7c3544710897ad9127d320dd02293fe
|
||||
---
|
||||
core/sysprop.mk | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/core/sysprop.mk b/core/sysprop.mk
|
||||
index d2551aa44d..f913d11743 100644
|
||||
--- a/core/sysprop.mk
|
||||
+++ b/core/sysprop.mk
|
||||
@@ -77,6 +77,9 @@ define generate-common-build-props
|
||||
echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\
|
||||
)\
|
||||
)\
|
||||
+ $(if $(filter product,$(1)),\
|
||||
+ echo "ro.build.display.id=$(BUILD_DISPLAY_ID)" >> $(2);\
|
||||
+ )\
|
||||
echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\
|
||||
echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\
|
||||
echo "ro.$(1).build.fingerprint=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user