Initial commit for Android 10, syncing up to v201
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
From 5529a224373874a11d77fd31e25428cc10fbc1a4 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 6 Sep 2019 15:10:28 +0200
|
||||
Subject: [PATCH] Whitelist radio HALs (needed because they need to e in
|
||||
framework because of weird jarjar issue)
|
||||
|
||||
Change-Id: If1ccbedde92955bb86f4c6db6d68502784de1d8d
|
||||
---
|
||||
core/tasks/check_boot_jars/package_whitelist.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
|
||||
index 7e2e56c4c..daa23ddbd 100644
|
||||
--- a/core/tasks/check_boot_jars/package_whitelist.txt
|
||||
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
|
||||
@@ -247,3 +247,6 @@ org\.chromium\.arc\..*
|
||||
# LineageOS
|
||||
lineageos\.platform
|
||||
org\.lineageos\.platform\.internal
|
||||
+
|
||||
+vendor\.samsung\.hardware\.radio\.V1_2
|
||||
+vendor\.mediatek\.hardware\.radio\.V2_0
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 1c3ecb1fd46c76111d44f600532068f307ccacbc Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 14 Sep 2019 21:25:07 +0200
|
||||
Subject: [PATCH 2/2] Add BOARD_SYSTEMIMAGE_AS_SYSTEM parameter to build SaS
|
||||
GSI
|
||||
|
||||
Change-Id: I764f0ef4e3be9a338fbe93944445cedc29d2bb81
|
||||
---
|
||||
core/Makefile | 1 +
|
||||
tools/releasetools/build_image.py | 4 ++++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/core/Makefile b/core/Makefile
|
||||
index 4611fb388..9ab207c6d 100644
|
||||
--- a/core/Makefile
|
||||
+++ b/core/Makefile
|
||||
@@ -1345,6 +1345,7 @@ endif # PRODUCT_USE_DYNAMIC_PARTITIONS
|
||||
# $(3): additional "key=value" pairs to append to the dictionary file.
|
||||
define generate-image-prop-dictionary
|
||||
$(if $(filter $(2),system),\
|
||||
+ $(if $(BOARD_SYSTEMIMAGE_AS_SYSTEM),$(hide) echo "system_as_system=$(BOARD_SYSTEMIMAGE_AS_SYSTEM)" >> $(1))
|
||||
$(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))
|
||||
$(if $(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE),$(hide) echo "system_other_size=$(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE)" >> $(1))
|
||||
$(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
|
||||
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
|
||||
index 4136ed432..96f7ddcb0 100755
|
||||
--- a/tools/releasetools/build_image.py
|
||||
+++ b/tools/releasetools/build_image.py
|
||||
@@ -157,6 +157,8 @@ def SetUpInDirAndFsConfig(origin_in, prop_dict):
|
||||
|
||||
if prop_dict["mount_point"] != "system":
|
||||
return origin_in, fs_config
|
||||
+ if "system_as_system" in prop_dict:
|
||||
+ return origin_in, fs_config
|
||||
|
||||
if "first_pass" in prop_dict:
|
||||
prop_dict["mount_point"] = "/"
|
||||
@@ -564,6 +566,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
|
||||
if not copy_prop("system_extfs_rsv_pct", "extfs_rsv_pct"):
|
||||
d["extfs_rsv_pct"] = "0"
|
||||
copy_prop("system_reserved_size", "partition_reserved_size")
|
||||
+
|
||||
+ copy_prop("system_as_system", "system_as_system")
|
||||
elif mount_point == "system_other":
|
||||
# We inherit the selinux policies of /system since we contain some of its
|
||||
# files.
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Reference in New Issue
Block a user