Elliott Hughes
047a1cdd11
am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."
...
* commit '294137266378371a3d08da1d6fb82a25d5b42cea':
Adding ABI output to debuggerd tombstones.
2014-06-04 21:44:21 +00:00
Elliott Hughes
2941372663
am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."
...
* commit '20df39a08981f6283359917382db4270ed3a4503':
Adding ABI output to debuggerd tombstones.
2014-06-04 21:29:03 +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
63cdd840f8
am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"
...
* commit 'e948c9faaa4861f578ebe00c8d2fabe7908e24a6':
Add new AID shared by all apps in a profile
2014-06-04 19:04:12 +00:00
Robin Lee
e948c9faaa
am 489797c2: Merge "Add new AID shared by all apps in a profile"
...
* commit '489797c2cbf9e22ea64dc9b88dec8271129e77bd':
Add new AID shared by all apps in a profile
2014-06-04 18:51:44 +00: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
b2a9129e8f
am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"
...
* commit 'bf0ed82485e0166dd5f5c9415026c2dc3fd2ae4b':
libutils: turn on -Werror
2014-06-04 18:26:41 +00:00
Mark Salyzyn
bf0ed82485
am 60ca7a22: Merge "libutils: turn on -Werror"
...
* commit '60ca7a222315569c043e23a515cd990d2857df17':
libutils: turn on -Werror
2014-06-04 18:12:44 +00:00
Mark Salyzyn
60ca7a2223
Merge "libutils: turn on -Werror"
2014-06-04 17:55:05 +00:00
Colin Cross
35ea352cb8
am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"
...
* commit '9924bfba6972861b0d0429717e02a27501a4e983':
DO NOT MERGE: Revert "delete libnl_2"
2014-06-04 17:28:42 +00:00
Colin Cross
9924bfba69
am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"
...
* commit '6e3fffeca6ac00379b0a22888d04a58ee0f51057':
DO NOT MERGE: Revert "delete libnl_2"
2014-06-04 15:19:39 +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
4e3f28e748
am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
...
* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
2014-06-04 12:27:05 +00: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
e7110ac09b
am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
...
* commit 'b122da648dd1a7860776bc90b219ffa8c215faa6':
Fix libcutils/dlmalloc_stubs.c build breakage.
2014-06-04 04:06:03 +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
04511126a6
am d586e356: Merge "Fix build."
...
* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
Fix build.
2014-06-04 01:39:29 +00: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
2e389193b0
am a8a7f001: Merge "Fix x86 and x86_64 builds."
...
* commit 'a8a7f001f142a77a2c406455ace4a8c00e692111':
Fix x86 and x86_64 builds.
2014-06-04 00:33:18 +00: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
Elliott Hughes
a005445a7a
am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"
...
* commit 'ddde05f3eec76513ae5d973a1c5d69494349f082':
[MIPS64] Build debuggerd for mips64
2014-06-03 23:44:13 +00: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
5a8335c318
am ed30b7ea: Merge "Fix build."
...
* commit 'ed30b7ea75532a5b2963acb8bae23e73493a851b':
Fix build.
2014-06-03 22:48:05 +00:00
Elliott Hughes
0d31d4877c
am d3b61d18: Merge "Clean up the debuggerd makefile."
...
* commit 'd3b61d184ecffc4ac69e8573fcb00cc295a0d550':
Clean up the debuggerd makefile.
2014-06-03 22:48:05 +00: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
b85c2494df
am 03b87b49: Merge "Make host ashmem_create_region seed only once."
...
* commit '03b87b49fae82a6304ab69b10426701c4f82c7e9':
Make host ashmem_create_region seed only once.
2014-06-03 20:48:37 +00: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
a9fc6a52b9
am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"
...
* commit 'b0b343d0864556816d89af61f7418130cea047d0':
liblog: test: Send bionc's fatal logging to the crash log
2014-06-03 17:29:32 +00:00
Mark Salyzyn
b0b343d086
Merge "liblog: test: Send bionc's fatal logging to the crash log"
2014-06-03 17:12:31 +00:00
Nick Kralevich
38fd5650ea
am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"
...
* commit '82015d4f127219700992f8800118fd9c388e3c99':
Only allow disabling SELinux on userdebug / eng builds
2014-06-03 16:39:51 +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
7cf8e1cb88
am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."
...
* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
Skip the "--abi" flag on "adb install" if present.
2014-06-03 13:29:03 +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
c99dd0c58d
am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
...
* commit '676f7d509d683921335ccddc2f267a73eb5c60c6':
libcutils: fix rw FS remount check issue
2014-06-03 01:09:07 +00: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
5ce10c4d24
am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"
...
* commit '00d70979632fb72a7837206476505af3a030f782':
liblog: cache getuid() syscall
2014-06-02 20:15:26 +00:00