Commits

Author Commit Message Labels Comments Date
Stephen Smalley
Merge branch 'master' into seandroid
Branches
seandroid
Nick Kralevich
Merge "file_contexts: Label /dev/ttyS2 as console_device"
Miodrag Dinic
file_contexts: Label /dev/ttyS2 as console_device This fixes the issue with the emulator "-shell" option. Init tries to open the console which is passed through the kernel androidboot.console property, but fails to open it because "avc" denies it. Init only has permissions to open console_device in rw mode. This ensures that /dev/ttyS2 is properly labeled as console_device. Replaced tabs with spaces. Change-Id: I9ef94576799bb724fc22f6be54f12de1…
Tao Bao
Merge "Enable verbose output for add_img_to_target_files."
Nick Kralevich
Merge "mgrep: add output to environment commands"
Evgenii Stepanov
Merge "Use a different linker for ASan binaries."
Tao Bao
Enable verbose output for add_img_to_target_files. Change-Id: I7246c59c79ccf6a7589c884391d0f690746fc129
Tao Bao
Merge "Assert the stash size when generating OTAs."
Tao Bao
Assert the stash size when generating OTAs. With block-based OTA v2 and v3, it requires stash space on the /cache partition to back up blocks during an update. We need to ensure that it doesn't exceed the partition size. Since there might be other files on /cache as well, we use cache_size * threshold as the maximum allowed size. The threshold defaults to 0.8, which can be overridden by command line option '--stash_threshold'. Change-Id: I…
Evgenii Stepanov
Use a different linker for ASan binaries. Another change in bionic/linker adds linker_asan/linker_asan64 that know where to find ASan shared libraries. Also, include linker_asan to the required packages list when building for ASan. Change-Id: I8ebe7c0091bbeb0c135708a891d33d9844373d37
Evgenii Stepanov
Merge "Disable detection of bugs on global variables."
Evgenii Stepanov
Disable detection of bugs on global variables. This is a temporary change pending code cleanup. We are already disabling detection of ODR violations. As it turns out, an ODR between an ASan-instrumented library and a non-instrumented library may actually crash ASan, and there is no obvious way out, and one of those prevents us from booting a SANITIZE_TARGET image right now. Bug: 21951850 Change-Id: I49508242ec96089a3d4d8b7e45f36323d62f2be9
William Roberts
mgrep: add output to environment commands Change-Id: I7a97e00c7ef5ac179333303d89511c2f72cbd100 Signed-off-by: William Roberts <william.c.roberts@intel.com>
Stephen Smalley
Merge branch 'master' into seandroid
Branches
seandroid
Tao Bao
Merge "Fix the permission in common.ZipWriteStr()."
Tao Bao
Fix the permission in common.ZipWriteStr(). common.ZipWriteStr() should set a default file permission to 0o100644 instead of 0o644. Change-Id: I8c89d8442b095b56ad3a0d47afdfa73ce55ad0c8
Tao Bao
Merge "Pack file_contexts into target_files zip."
Tao Bao
Pack file_contexts into target_files zip. file_contexts (specified by SELINUX_FC) is needed both when building and (re)packaging. We used to use the copy in out/ when building, and looked for the copy in BOOT/RAMDISK/ when packaging from target_files zip. With system_root_image enabled, the file_contexts needed for building and packaging might be different from the one on device. So we explicitly pack the file as META/file_contexts in tar…
Tao Bao
Merge "Zero out blocks that may be touched by dm-verity."
Tao Bao
Zero out blocks that may be touched by dm-verity. dm-verity may touch some blocks that are not in the care_map due to block device read-ahead. It will fail if such blocks contain non-zeroes. As a workaround, we mark them as extended blocks and zero out explicitly to avoid dm-verity failures. Bug: 20881595 Change-Id: Id097138bfd065c84eac088b3ad49758010b2927b (cherry picked from commit 2fd2c9bfd6c9beeaeccb4632b785227fe56c6006)
Elliott Hughes
Merge "Remove HAVE_WIN32_IPC."
Elliott Hughes
Remove HAVE_WIN32_IPC. Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
Elliott Hughes
Merge "Remove mkbootimg from the pathmap."
Elliott Hughes
Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
Elliott Hughes
Remove mkbootimg from the pathmap. It's only ever referred to directly. (Should probably move to system/core/include, but that's orthogonal to this change.) Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
Elliott Hughes
Merge "Remove pathmap.mk entries for libc."
Elliott Hughes
Remove pathmap.mk entries for libc. Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
Elliott Hughes
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h. Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
Tao Bao
Merge "Scan all init.*.rc files for flash_recovery service."
Tao Bao
Scan all init.*.rc files for flash_recovery service. Clockwork builds may rename init.rc to init.core.rc. Change the OTA script to scan all init.*.rc files to determine the proper location for install-recovery.sh. Bug: 22128990 Change-Id: Icad3497d1663e074b938919b40fc239c84fbeb2b (cherry picked from commit 610754e5ad84b2e65358d85dd38a4e0c86dc9342)
  1. Prev
  2. Next