6866041ff0
This CL fixes the design problem of the previous mechanism for providing the bootstrap bionic and the runtime bionic to the same path. Previously, bootstrap bionic was self-bind-mounted; i.e. /system/bin/libc.so is bind-mounted to itself. And the runtime bionic was bind-mounted on top of the bootstrap bionic. This has not only caused problems like `adb sync` not working(b/122737045), but also is quite difficult to understand due to the double-and-self mounting. This is the new design: Most importantly, these four are all distinct: 1) bootstrap bionic (/system/lib/bootstrap/libc.so) 2) runtime bionic (/apex/com.android.runtime/lib/bionic/libc.so) 3) mount point for 1) and 2) (/bionic/lib/libc.so) 4) symlink for 3) (/system/lib/libc.so -> /bionic/lib/libc.so) Inside the mount namespace of the pre-apexd processes, 1) is bind-mounted to 3). Likewise, inside the mount namespace of the post-apexd processes, 2) is bind-mounted to 3). In other words, there is no self-mount, and no double-mount. Another change is that mount points are under /bionic and the legacy paths become symlinks to the mount points. This is to make sure that there is no bind mounts under /system, which is breaking some apps. Finally, code for creating mount namespaces, mounting bionic, etc are refactored to mount_namespace.cpp Bug: 120266448 Bug: 123275379 Test: m, device boots, adb sync/push/pull works, especially with following paths: /bionic/lib64/libc.so /bionic/bin/linker64 /system/lib64/bootstrap/libc.so /system/bin/bootstrap/linker64 Change-Id: Icdfbdcc1efca540ac854d4df79e07ee61fca559f
119 lines
2.6 KiB
Makefile
119 lines
2.6 KiB
Makefile
# Copyright 2005 The Android Open Source Project
|
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
|
|
# --
|
|
|
|
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
|
init_options += \
|
|
-DALLOW_LOCAL_PROP_OVERRIDE=1 \
|
|
-DALLOW_PERMISSIVE_SELINUX=1 \
|
|
-DREBOOT_BOOTLOADER_ON_PANIC=1 \
|
|
-DWORLD_WRITABLE_KMSG=1 \
|
|
-DDUMP_ON_UMOUNT_FAILURE=1
|
|
else
|
|
init_options += \
|
|
-DALLOW_LOCAL_PROP_OVERRIDE=0 \
|
|
-DALLOW_PERMISSIVE_SELINUX=0 \
|
|
-DREBOOT_BOOTLOADER_ON_PANIC=0 \
|
|
-DWORLD_WRITABLE_KMSG=0 \
|
|
-DDUMP_ON_UMOUNT_FAILURE=0
|
|
endif
|
|
|
|
ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
|
|
init_options += \
|
|
-DSHUTDOWN_ZERO_TIMEOUT=1
|
|
else
|
|
init_options += \
|
|
-DSHUTDOWN_ZERO_TIMEOUT=0
|
|
endif
|
|
|
|
init_options += -DLOG_UEVENTS=0
|
|
|
|
init_cflags += \
|
|
$(init_options) \
|
|
-Wall -Wextra \
|
|
-Wno-unused-parameter \
|
|
-Werror \
|
|
|
|
# --
|
|
|
|
# Do not build this even with mmma if we're system-as-root, otherwise it will overwrite the symlink.
|
|
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
|
|
include $(CLEAR_VARS)
|
|
LOCAL_CPPFLAGS := $(init_cflags)
|
|
LOCAL_SRC_FILES := \
|
|
devices.cpp \
|
|
first_stage_init.cpp \
|
|
first_stage_main.cpp \
|
|
first_stage_mount.cpp \
|
|
mount_namespace.cpp \
|
|
reboot_utils.cpp \
|
|
selinux.cpp \
|
|
switch_root.cpp \
|
|
uevent_listener.cpp \
|
|
util.cpp \
|
|
|
|
LOCAL_MODULE := init_first_stage
|
|
LOCAL_MODULE_STEM := init
|
|
|
|
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
|
|
|
LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)
|
|
LOCAL_UNSTRIPPED_PATH := $(TARGET_RAMDISK_OUT_UNSTRIPPED)
|
|
|
|
# Set up the same mount points on the ramdisk that system-as-root contains.
|
|
LOCAL_POST_INSTALL_CMD := \
|
|
mkdir -p $(TARGET_RAMDISK_OUT)/dev \
|
|
$(TARGET_RAMDISK_OUT)/mnt \
|
|
$(TARGET_RAMDISK_OUT)/proc \
|
|
$(TARGET_RAMDISK_OUT)/sys \
|
|
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libfs_avb \
|
|
libfs_mgr \
|
|
libfec \
|
|
libfec_rs \
|
|
libsquashfs_utils \
|
|
liblogwrap \
|
|
libext4_utils \
|
|
libfscrypt \
|
|
libseccomp_policy \
|
|
libcrypto_utils \
|
|
libsparse \
|
|
libavb \
|
|
libkeyutils \
|
|
liblp \
|
|
libcutils \
|
|
libbase \
|
|
liblog \
|
|
libcrypto \
|
|
libdl \
|
|
libz \
|
|
libselinux \
|
|
libcap \
|
|
libgsi \
|
|
|
|
LOCAL_SANITIZE := signed-integer-overflow
|
|
# First stage init is weird: it may start without stdout/stderr, and no /proc.
|
|
LOCAL_NOSANITIZE := hwaddress
|
|
include $(BUILD_EXECUTABLE)
|
|
endif
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := init_system
|
|
LOCAL_REQUIRED_MODULES := \
|
|
init_second_stage \
|
|
|
|
include $(BUILD_PHONY_PACKAGE)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := init_vendor
|
|
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
|
|
LOCAL_REQUIRED_MODULES := \
|
|
init_first_stage \
|
|
|
|
endif
|
|
include $(BUILD_PHONY_PACKAGE)
|