summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Switch md5 over to openssl rather than libc.Elliott Hughes2014-06-092-68/+66
| | | | | | | | | It doesn't make any sense for the C library to contain private stuff that's only used by toolbox. Rather than move that stuff out of bionic and into here, let's just use the same MD5 implementation the rest of the system's using. Change-Id: Ia1c73164124094b532af3453b90c4bd1ebfdaa24
* DO NOT MERGE: Revert "delete libnl_2"Colin Cross2014-06-0413-0/+1450
| | | | | | | This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e. libnl_2 needs to stay in AOSP for now for compatibility with GPL test builds.
* Merge "Use format(gnu_printf, ...) for windows build with ↵Andrew Hsieh2014-06-041-0/+8
|\ | | | | | | __USE_MINGW_ANSI_STDIO"
| * Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIOAndrew Hsieh2014-05-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | With __USE_MINGW_ANSI_STDIO mingw compiler uses its own replacement printf*/scanf* libraries instead of Microsoft's ones which aren't always C99 compatible. Declare "archetype" of attribute format to gnu_printf because the default "printf" in mingw follows MS standard. One result is that "%z" (a gnu-extension) is accepted w/o warning by mingw compiler Change-Id: I3e92f34e2a1e8d664b4f1f55d450f7c2790671f3
* | Merge "Fix libcutils/dlmalloc_stubs.c build breakage."Elliott Hughes2014-06-041-1/+0
|\ \
| * | Fix libcutils/dlmalloc_stubs.c build breakage.Elliott Hughes2014-06-031-1/+0
| | | | | | | | | | | | Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
* | | Merge "Fix build."Mathieu Chartier2014-06-041-1/+3
|\ \ \
| * | | Fix build.Mathieu Chartier2014-06-031-1/+3
| | | | | | | | | | | | | | | | Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
* | | | Merge "Fix x86 and x86_64 builds."Christopher Ferris2014-06-042-2/+2
|\ \ \ \
| * | | | Fix x86 and x86_64 builds.Christopher Ferris2014-06-032-2/+2
|/ / / / | | | | | | | | | | | | Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
* | | | Merge "[MIPS64] Build debuggerd for mips64"Elliott Hughes2014-06-031-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [MIPS64] Build debuggerd for mips64Duane Sand2014-06-031-0/+2
| | | | | | | | | | | | | | | | Change-Id: I361e9668baa218fc01e723c2df1a34ca6329cf47
* | | | Merge "Fix build."Mathieu Chartier2014-06-031-10/+8
|\ \ \ \
| * | | | Fix build.Mathieu Chartier2014-06-031-10/+8
| | |/ / | |/| | | | | | | | | | Change-Id: I6bafe6221e1ce7e4b04269df90996ab08b050e93
* | | | Merge "Clean up the debuggerd makefile."Elliott Hughes2014-06-031-16/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Clean up the debuggerd makefile.Elliott Hughes2014-06-031-16/+15
|/ / / | | | | | | | | | | | | | | | | | | In particular, turn on -Wunused, which is globally off by default thanks to build/core/config.mk. Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
* | | Merge "Make host ashmem_create_region seed only once."Mathieu Chartier2014-06-031-61/+63
|\ \ \
| * | | Make host ashmem_create_region seed only once.Mathieu Chartier2014-06-031-61/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not seeding this each call should help reduce collisions when multiple threads are calling ashmem_create_region. Also cleaned up code by deleting gotos, and making formatting consistent. Bug: 15394258 Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
* | | | Merge "liblog: test: Send bionc's fatal logging to the crash log"Mark Salyzyn2014-06-031-2/+2
|\ \ \ \
| * | | | liblog: test: Send bionc's fatal logging to the crash logMark Salyzyn2014-06-031-2/+2
|/ / / / | | | | | | | | | | | | | | | | Bug: 14159417 Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
* | | | Merge "Only allow disabling SELinux on userdebug / eng builds"Nick Kralevich2014-06-032-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Only allow disabling SELinux on userdebug / eng buildsNick Kralevich2014-06-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only parse and honor the kernel command line on userdebug or eng builds. On user builds, assume that selinux is always enabled and enforcing. Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
* | | | Merge "Skip the "--abi" flag on "adb install" if present."Narayan Kamath2014-06-031-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Skip the "--abi" flag on "adb install" if present.Narayan Kamath2014-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag needs to be passed through to the package manager. Without this change, the argument to this flag is interpreted as a filename. NOTE: If we don't want to add special treatment for this flag, we'll have to assume that all flags with a -- prefix have an argument, and that isn't necessarily true. Change-Id: I78c3fa842bc24148d83d7278e6dee395686240a0
* | | | am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7': libcutils: fix rw FS remount check issue
| * \ \ \ Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
| |\ \ \ \
| | * | | | libcutils: fix rw FS remount check issueHong-Mei Li2014-06-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some condition, some of FS would set disable_roll_forward option. In this case, when we do power off or reboot, the power down progress would stuck at android_reboot for 360 sec. The reason is, remount_ro_done function check key word "rw" to determine whether all the read-write FS has been remounted as read-only FS. Unfortunately, it takes disable_roll_forward as a rw flag too by mistake, so the check would always fail, until reach 360 sec threshold. The patch would match "rw," from mount options, this can avoid the issue successfully. Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a Signed-off-by: Hong-Mei Li <a21834@motorola.com>
* | | | | am bf0f2590: Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bf0f25905b12581f05b65b1ebe95211c727ae483': liblog: cache getuid() syscall
| * | | | Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | liblog: cache getuid() syscallMark Salyzyn2014-06-021-7/+10
| |/ / / | | | | | | | | | | | | | | | | BUG: 15315766 Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
* | | | am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a': SELinux changes to check policy versions during a reload.
| * | | Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
| |\ \ \
| | * | | SELinux changes to check policy versions during a reload.Robert Craig2014-04-281-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deciding on which property_contexts policy to load during a reload, an initial call is made to libselinux to grab the correct policy index. This policy index represents whether the /data/security or the rootfs version will be used. Change-Id: I4716039bb0f5ba1e961977a18350347a67969dca Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | | am 570cd46d: Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '570cd46d14645f622e9972671308fdb4f2425292': Revert "Move libutils to libc++"
| * | | | Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
| |\ \ \ \
| | * | | | Revert "Move libutils to libc++"Dan Albert2014-05-302-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes issues in the unbundled branches. This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350. Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
* | | | | | am 9f69e028: Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6': Move libutils to libc++
| * | | | | Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move libutils to libc++Dan Albert2014-05-292-9/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
* | | | | am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"Mark Salyzyn2014-05-291-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390': String16.cpp rm unused utils/Debug.h
| * | | | Merge "String16.cpp rm unused utils/Debug.h"Mark Salyzyn2014-05-291-1/+0
| |\ \ \ \
| | * | | | String16.cpp rm unused utils/Debug.hMark Salyzyn2014-05-291-1/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
* | | | | am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"Dave Allison2014-05-291-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '967729b7ca675d6f2c895a1bd56216a62b217e50': Add LD_PRELOAD for libsigchain.so to the environment
| * | | | Merge "Add LD_PRELOAD for libsigchain.so to the environment"Dave Allison2014-05-291-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add LD_PRELOAD for libsigchain.so to the environmentDave Allison2014-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To remove the need to modify the bionic dynamic linker, add the signal chaining library as a preload in the environment. This will be picked up by the dynamic linker and will override sigaction and sigprocmask to allow for signal chaining. Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
* | | | | am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bf082ffb71c40e4670410b246309a182d9dafcf5': Updated trace.h to recognize ATRACE_TAG_BIONIC.
| * | | | Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
| |\ \ \ \
| | * | | | Updated trace.h to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15116468 Change-Id: If8d4971505ffe5cbc193c6ad71618a5adb8192b6
* | | | | | am 811f2c0b: Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '811f2c0b98d6f8935123221648c96ff975688902': system/window.h: add deprecation warnings
| * | | | | Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
| |\ \ \ \ \