Commit graph

7947 commits

Author SHA1 Message Date
Mark Salyzyn
8d7656b8c1 logd: logcat unexpected EOF on slow consoles
Change-Id: I3520aa05e080de85df352ef36ae16e0406311f3c
2014-06-06 15:08:37 +00:00
Narayan Kamath
b7b92ae22c Merge "Fix build." 2014-06-06 10:20:45 +00:00
Narayan Kamath
c00de56063 Fix build.
Uncommitted changes from a rename.

Change-Id: If1cac7104c436970f905eede683040ae79529292
2014-06-06 10:20:37 +00:00
Narayan Kamath
a8c89ee35a Merge "Reject zip files that have trailing bytes after their CD." 2014-06-06 10:05:23 +00:00
Ian Rogers
4ca26ce8ec Merge "Host multilib build of both 32-bit and 64-bit libraries." 2014-06-05 22:38:15 +00:00
Ian Rogers
59ec765382 Host multilib build of both 32-bit and 64-bit libraries.
Change-Id: I54f91f385b109fc664a1a1f9320affb2a846fef1
2014-06-05 15:26:22 -07:00
Ian Rogers
e0115dd130 Merge "Build host with multilib both enabled." 2014-06-05 18:45:05 +00:00
Ian Rogers
46601793e3 Build host with multilib both enabled.
Change-Id: I58fa91bc097dfba573b6db27e389f5ed6556032f
2014-06-05 11:42:26 -07:00
Narayan Kamath
4f6b499ead Reject zip files that have trailing bytes after their CD.
bug: 15287086
Change-Id: I03219c4c2ca6afc9d417a35bd98ae682f478fc25
2014-06-05 18:37:08 +01:00
Robin Lee
46fbaf062f Merge "Create world-searchable /data/misc/user directory" 2014-06-05 17:07:43 +00:00
Elliott Hughes
aa2be4fd69 Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64" 2014-06-05 03:26:11 +00:00
Elliott Hughes
20df39a089 Merge "Adding ABI output to debuggerd tombstones." 2014-06-04 21:11:47 +00:00
Brigid Smith
9c8dacce55 Adding ABI output to debuggerd tombstones.
Bug: 15084471
Change-Id: If9fb260a3403e86f80928f2f5f79331fc0936030
2014-06-04 12:29:24 -07:00
Robin Lee
489797c2cb Merge "Add new AID shared by all apps in a profile" 2014-06-04 18:45:02 +00:00
Mark Salyzyn
60ca7a2223 Merge "libutils: turn on -Werror" 2014-06-04 17:55:05 +00:00
Colin Cross
6e3fffeca6 DO NOT MERGE: Revert "delete libnl_2"
This reverts commit 7097f052d9.

libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
2014-06-04 08:15:48 -07:00
Andrew Hsieh
7ab32aca56 Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO" 2014-06-04 07:11:00 +00:00
Elliott Hughes
b122da648d Merge "Fix libcutils/dlmalloc_stubs.c build breakage." 2014-06-04 03:50:33 +00:00
Elliott Hughes
7f0ef73e70 Fix libcutils/dlmalloc_stubs.c build breakage.
Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
2014-06-03 20:48:44 -07:00
Mathieu Chartier
d586e35652 Merge "Fix build." 2014-06-04 01:17:07 +00:00
Mathieu Chartier
e942d1f9ea Fix build.
Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
2014-06-03 18:12:29 -07:00
Christopher Ferris
a8a7f001f1 Merge "Fix x86 and x86_64 builds." 2014-06-04 00:17:54 +00:00
Christopher Ferris
3520086e3d Fix x86 and x86_64 builds.
Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
2014-06-03 17:13:37 -07:00
Duane Sand
f1d63bdf00 [MIPS64] Use generic cpu-independent libpixelflinger for mips64
For now, use generic C code instead of generated mips instructions,
in the same manner as used on x86 and x86_64 targets.

Change-Id: If3607484e0a446a755c62c030b3069d46ab5beb2
2014-06-03 16:53:12 -07:00
Elliott Hughes
ddde05f3ee Merge "[MIPS64] Build debuggerd for mips64" 2014-06-03 23:26:33 +00:00
Duane Sand
a80b759857 [MIPS64] Build debuggerd for mips64
Change-Id: I361e9668baa218fc01e723c2df1a34ca6329cf47
2014-06-03 16:24:57 -07:00
Mathieu Chartier
ed30b7ea75 Merge "Fix build." 2014-06-03 22:35:23 +00:00
Elliott Hughes
d3b61d184e Merge "Clean up the debuggerd makefile." 2014-06-03 22:34:28 +00:00
Mathieu Chartier
0b9674f241 Fix build.
Change-Id: I6bafe6221e1ce7e4b04269df90996ab08b050e93
2014-06-03 15:32:10 -07:00
Elliott Hughes
8c597684b1 Clean up the debuggerd makefile.
In particular, turn on -Wunused, which is globally off by default
thanks to build/core/config.mk.

Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
2014-06-03 15:12:07 -07:00
Mathieu Chartier
03b87b49fa Merge "Make host ashmem_create_region seed only once." 2014-06-03 19:02:35 +00:00
Mathieu Chartier
1104ae8cfc Make host ashmem_create_region seed only once.
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
2014-06-03 11:47:58 -07:00
Mark Salyzyn
b0b343d086 Merge "liblog: test: Send bionc's fatal logging to the crash log" 2014-06-03 17:12:31 +00:00
Mark Salyzyn
90aa3d59a5 liblog: test: Send bionc's fatal logging to the crash log
Bug: 14159417
Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
2014-06-03 09:29:11 -07:00
Nick Kralevich
82015d4f12 Merge "Only allow disabling SELinux on userdebug / eng builds" 2014-06-03 16:17:52 +00:00
Narayan Kamath
4e26c95a63 Merge "Skip the "--abi" flag on "adb install" if present." 2014-06-03 09:58:24 +00:00
Nick Kralevich
f3c85b2488 Only allow disabling SELinux on userdebug / eng builds
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
2014-06-02 20:56:04 -07:00
JP Abgrall
676f7d509d am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7':
  libcutils: fix rw FS remount check issue
2014-06-03 01:05:33 +00:00
JP Abgrall
fc85a7a848 Merge "libcutils: fix rw FS remount check issue" 2014-06-03 01:01:36 +00:00
Hong-Mei Li
88f7683d9c libcutils: fix rw FS remount check issue
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>
2014-06-02 22:45:37 -07:00
Mark Salyzyn
5bed803664 libutils: turn on -Werror
- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue

Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
2014-06-02 15:57:50 -07:00
Mark Salyzyn
00d7097963 am bf0f2590: Merge "liblog: cache getuid() syscall"
* commit 'bf0f25905b12581f05b65b1ebe95211c727ae483':
  liblog: cache getuid() syscall
2014-06-02 20:11:56 +00:00
Mark Salyzyn
bf0f25905b Merge "liblog: cache getuid() syscall" 2014-06-02 20:09:19 +00:00
Mark Salyzyn
076ba81ce9 liblog: cache getuid() syscall
BUG: 15315766
Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
2014-06-02 12:33:57 -07:00
Nick Kralevich
6fb92bd84b am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
* commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a':
  SELinux changes to check policy versions during a reload.
2014-05-31 05:05:52 +00:00
Nick Kralevich
252b0e2b46 Merge "SELinux changes to check policy versions during a reload." 2014-05-31 05:03:05 +00:00
Dan Albert
e8f90ca60d am 570cd46d: Merge "Revert "Move libutils to libc++""
* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"
2014-05-30 20:17:32 +00:00
Dan Albert
570cd46d14 Merge "Revert "Move libutils to libc++"" 2014-05-30 20:13:48 +00:00
Dan Albert
7bc49a16e8 Revert "Move libutils to libc++"
Causes issues in the unbundled branches.

This reverts commit dc133729b0.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
2014-05-30 19:40:58 +00:00
Dan Albert
36f536fc7b am 9f69e028: Merge "Move libutils to libc++"
* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
  Move libutils to libc++
2014-05-30 18:40:25 +00:00