Initial commit, syncing up to v115
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
From d7fa115dcb7aaf33a6a16b676742513e5539fd85 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 27 Mar 2018 23:26:49 +0200
|
||||
Subject: [PATCH] Revert "Remove root folder bt_firmware in GSI"
|
||||
|
||||
This reverts commit 292b8433cb48ef4ceb2330e57e11b8f644d9d1ee.
|
||||
|
||||
Essential 8.1 firmware requires this
|
||||
---
|
||||
target/board/generic_arm64_ab/BoardConfig.mk | 2 +-
|
||||
target/board/generic_arm64_ab/sepolicy/file.te | 1 +
|
||||
target/board/generic_arm64_ab/sepolicy/file_contexts | 1 +
|
||||
3 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
|
||||
index 88b90a8fb..b67c3b31d 100644
|
||||
--- a/target/board/generic_arm64_ab/BoardConfig.mk
|
||||
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
|
||||
@@ -33,7 +33,7 @@ TARGET_NO_RECOVERY := true
|
||||
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
|
||||
|
||||
# TODO(jiyong) These might be SoC specific.
|
||||
-BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
|
||||
+BOARD_ROOT_EXTRA_FOLDERS += bt_firmware firmware firmware/radio persist
|
||||
BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
|
||||
BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
|
||||
BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
|
||||
diff --git a/target/board/generic_arm64_ab/sepolicy/file.te b/target/board/generic_arm64_ab/sepolicy/file.te
|
||||
index 7adfdfa4e..46455339a 100644
|
||||
--- a/target/board/generic_arm64_ab/sepolicy/file.te
|
||||
+++ b/target/board/generic_arm64_ab/sepolicy/file.te
|
||||
@@ -1,5 +1,6 @@
|
||||
# TODO(b/36764215): remove this file when the generic system image
|
||||
# no longer has these directories
|
||||
+type bt_firmware_file, file_type;
|
||||
type persist_file, file_type;
|
||||
|
||||
# Default type for anything under /firmware.
|
||||
diff --git a/target/board/generic_arm64_ab/sepolicy/file_contexts b/target/board/generic_arm64_ab/sepolicy/file_contexts
|
||||
index 0a80559e1..92a4ff872 100644
|
||||
--- a/target/board/generic_arm64_ab/sepolicy/file_contexts
|
||||
+++ b/target/board/generic_arm64_ab/sepolicy/file_contexts
|
||||
@@ -2,6 +2,7 @@
|
||||
# no longer has these directories. They are specific to QCOM.
|
||||
|
||||
# /
|
||||
+/bt_firmware(/.*)? u:object_r:bt_firmware_file:s0
|
||||
/tombstones u:object_r:rootfs:s0
|
||||
/dsp u:object_r:rootfs:s0
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 98915840a5635fcd2f319012861cf5da1df8f54a Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 5 Mar 2018 22:27:50 +0100
|
||||
Subject: [PATCH 2/2] Set ro.build.fingerprint in system/etc/prop.default
|
||||
|
||||
Change-Id: Idceb2a160f70b36aa6806ae60cbfb325367f3b75
|
||||
---
|
||||
core/Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/core/Makefile b/core/Makefile
|
||||
index 0a2f6e39d..059aa98c2 100644
|
||||
--- a/core/Makefile
|
||||
+++ b/core/Makefile
|
||||
@@ -176,6 +176,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
|
||||
$(hide) echo ro.bootimage.build.date=`$(DATE_FROM_FILE)`>>$@
|
||||
$(hide) echo ro.bootimage.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@
|
||||
$(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
|
||||
+ $(hide) echo ro.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
|
||||
$(hide) build/make/tools/post_process_props.py $@
|
||||
ifdef property_overrides_split_enabled
|
||||
$(hide) mkdir -p $(TARGET_ROOT_OUT)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Reference in New Issue
Block a user