diff options
| -rw-r--r-- | init/Android.mk | 1 | ||||
| -rw-r--r-- | init/capabilities.cpp | 3 | ||||
| -rw-r--r-- | libutils/RefBase.cpp | 2 | ||||
| -rw-r--r-- | shell_and_utilities/README.md | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/init/Android.mk b/init/Android.mk index ac31ef161..895f50f43 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -78,6 +78,7 @@ LOCAL_REQUIRED_MODULES := \ LOCAL_POST_INSTALL_CMD := mkdir -p \ $(TARGET_RAMDISK_OUT)/debug_ramdisk \ $(TARGET_RAMDISK_OUT)/dev \ + $(TARGET_RAMDISK_OUT)/first_stage_ramdisk \ $(TARGET_RAMDISK_OUT)/mnt \ $(TARGET_RAMDISK_OUT)/proc \ $(TARGET_RAMDISK_OUT)/second_stage_resources \ diff --git a/init/capabilities.cpp b/init/capabilities.cpp index 0b9f16107..ab6ff03ef 100644 --- a/init/capabilities.cpp +++ b/init/capabilities.cpp @@ -69,11 +69,12 @@ static const std::map<std::string, int> cap_map = { #if defined(__BIONIC__) CAP_MAP_ENTRY(PERFMON), CAP_MAP_ENTRY(BPF), + CAP_MAP_ENTRY(CHECKPOINT_RESTORE), #endif }; #if defined(__BIONIC__) -static_assert(CAP_LAST_CAP == CAP_BPF, "CAP_LAST_CAP is not CAP_BPF"); +static_assert(CAP_LAST_CAP == CAP_CHECKPOINT_RESTORE, "CAP_LAST_CAP is not CAP_CHECKPOINT_RESTORE"); #else static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ"); #endif diff --git a/libutils/RefBase.cpp b/libutils/RefBase.cpp index 252309795..8e45226c5 100644 --- a/libutils/RefBase.cpp +++ b/libutils/RefBase.cpp @@ -55,7 +55,7 @@ // case. #define DEBUG_REFBASE_DESTRUCTION 1 -#if !defined(_WIN32) +#if !defined(_WIN32) && !defined(__APPLE__) // CallStack is only supported on linux type platforms. #define CALLSTACK_ENABLED 1 #else diff --git a/shell_and_utilities/README.md b/shell_and_utilities/README.md index 4510dc7a4..d169d29b4 100644 --- a/shell_and_utilities/README.md +++ b/shell_and_utilities/README.md @@ -182,7 +182,7 @@ umount uname uniq unix2dos uptime usleep uudecode uuencode vmstat wc which whoami xargs xxd yes zcat -## Android Q +## Android 10 ("Q") BSD: grep fsck\_msdos newfs\_msdos @@ -212,7 +212,7 @@ true truncate tty tunctl ulimit umount uname uniq unix2dos unlink unshare uptime usleep uudecode uuencode uuidgen vconfig vmstat watch wc which whoami xargs xxd yes zcat -## Android R +## Android 11 ("R") BSD: fsck\_msdos newfs\_msdos |