Initial unified commit for Android 13, with TrebleDroid GSI target, syncing up to 20221111
This commit is contained in:
@@ -0,0 +1,56 @@
|
||||
From 3127d705a0024e37f94174b17b94cf2fb331e7e4 Mon Sep 17 00:00:00 2001
|
||||
From: sooti <sooti85@gmail.com>
|
||||
Date: Tue, 12 Oct 2021 14:32:52 +0300
|
||||
Subject: [PATCH 1/5] build: remove emulator crap from GSI
|
||||
|
||||
Change-Id: Id45f3ff1d31e3d4492f956e68a1eb4b2fb82ce63
|
||||
---
|
||||
target/product/emulator.mk | 6 +++---
|
||||
target/product/emulator_vendor.mk | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
|
||||
index 36da1f7034..1497c061fc 100644
|
||||
--- a/target/product/emulator.mk
|
||||
+++ b/target/product/emulator.mk
|
||||
@@ -36,7 +36,7 @@ PRODUCT_PACKAGES += \
|
||||
|
||||
PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay
|
||||
|
||||
-PRODUCT_CHARACTERISTICS := emulator
|
||||
+# PRODUCT_CHARACTERISTICS := emulator
|
||||
|
||||
PRODUCT_FULL_TREBLE_OVERRIDE := true
|
||||
|
||||
@@ -56,5 +56,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
|
||||
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.25.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 5f354b54b48358256e5f6251939edfaa1d4127ff 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/5] 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 01897b77d2..a0a7c0d2fc 100644
|
||||
--- a/target/product/aosp_arm64.mk
|
||||
+++ b/target/product/aosp_arm64.mk
|
||||
@@ -51,9 +51,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.25.1
|
||||
|
||||
Reference in New Issue
Block a user