tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I306f5cc077588f0036726a3c5da9ce5acaeffacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-03 03:44:40 +00:00 committed by Automerger Merge Worker
commit b93e3b021e
3 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
target/product/gsi/Android.bp
View file

@ -23,3 +23,26 @@ filegroup {
"*.txt", "*.txt",
], ],
} }
prebuilt_etc {
name: "gsi_skip_mount.cfg",
filename: "skip_mount.cfg",
src: "gsi_skip_mount.cfg",
system_ext_specific: true,
relative_install_path: "init/config",
required: ["gsi_skip_mount_compat_symlink"],
}
// Adds a symlink under /system/etc/init/config pointing to /system/system_ext/etc/init/config
// because first-stage init in Android 10.0 will read the skip_mount.cfg from /system/etc/* after
// chroot /system.
// TODO: remove this symlink when no need to support new GSI on Android 10.
// The actual file needs to be under /system/system_ext because it's GSI-specific and does not
// belong to core CSI.
install_symlink {
name: "gsi_skip_mount_compat_symlink",
installed_location: "etc/init/config",
symlink_target: "/system/system_ext/etc/init/config",
}

26
target/product/gsi/Android.mk
View file

@ -239,32 +239,6 @@ LOCAL_REQUIRED_MODULES := \
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
#####################################################################
# skip_mount.cfg, read by init to skip mounting some partitions when GSI is used.
include $(CLEAR_VARS)
LOCAL_MODULE := gsi_skip_mount.cfg
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_STEM := skip_mount.cfg
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := init/config
# Adds a symlink under /system/etc/init/config pointing to /system/system_ext/etc/init/config
# because first-stage init in Android 10.0 will read the skip_mount.cfg from /system/etc/* after
# chroot /system.
# TODO: remove this symlink when no need to support new GSI on Android 10.
# The actual file needs to be under /system/system_ext because it's GSI-specific and does not
# belong to core CSI.
LOCAL_POST_INSTALL_CMD := \
mkdir -p $(TARGET_OUT)/etc/init; \
ln -sf /system/system_ext/etc/init/config $(TARGET_OUT)/etc/init/config
include $(BUILD_PREBUILT)
##################################################################### #####################################################################
# init.gsi.rc, GSI-specific init script. # init.gsi.rc, GSI-specific init script.

3
target/product/gsi_release.mk
View file

@ -28,9 +28,8 @@
BUILDING_GSI := true BUILDING_GSI := true
# Exclude all files under system/product and system/system_ext,
# and the vndk apex's compat symlinks
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/init/config \
system/product/% \ system/product/% \
system/system_ext/% \ system/system_ext/% \
system/lib/vndk-29 \ system/lib/vndk-29 \