Elliott Hughes
70b5cb7948
am c9343cfe: Merge "Refresh toolbox."
...
* commit 'c9343cfe404cd80fe7f1bf15184845d686b19794':
Refresh toolbox.
2014-07-25 18:32:30 +00:00
Nick Kralevich
1a423b2ee7
am 66083ae8: Merge "sdcard: ensure installd fs upgrade has completed"
...
* commit '66083ae834374074047f0eff41e80999660d4af1':
sdcard: ensure installd fs upgrade has completed
2014-07-25 18:32:29 +00:00
Neil Fuller
7a6705b886
am e91d9d80: Merge "Prevent the accidental closure of fd[0] for missing zip files."
...
* commit 'e91d9d80d18eca571f00c82b54cd44956299cbda':
Prevent the accidental closure of fd[0] for missing zip files.
2014-07-25 15:32:26 +00:00
Colin Cross
edf41f981c
am 8d9d362b: Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."
...
* commit '8d9d362b0cc999b11db2495c657a6b268705467a':
adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
2014-07-25 03:35:51 +00:00
Tim Murray
3a5f3db2aa
am c894ced1: Merge "Fix fastboot for Darwin."
...
* commit 'c894ced1837117aa3e2dfae702ef51c35b5d74d9':
Fix fastboot for Darwin.
2014-07-25 02:33:43 +00:00
Tim Murray
6ebaf311a7
am 721f189a: Merge "fix adb build on Darwin"
...
* commit '721f189a0571ab51388c8a223f343f3da78f28df':
fix adb build on Darwin
2014-07-25 02:20:30 +00:00
Elliott Hughes
6a223baf95
am 52508091: Merge "Silence healthd warnings."
...
* commit '525080910efd55df0d562980b6139c0efcc8a47c':
Silence healthd warnings.
2014-07-25 02:20:29 +00:00
Tim Murray
f2879ef614
am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."
...
* commit '6698ebf92857b7a390264b36603c57ae639b43a2':
Fix Darwin build caused by -Wunused-parameter.
2014-07-25 02:20:28 +00:00
Colin Cross
8d9d362b0c
Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."
2014-07-25 00:30:15 +00:00
DanielMo
43222b3f0a
adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
...
Change-Id: Id66997709fec55b1efd389abf2efa644b9a8ccf4
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-07-25 11:17:55 +08:00
Elliott Hughes
d8c3038b50
am d629c789: Merge "Remove <cutils/tztime.h>."
...
* commit 'd629c7892fca6a085ad1aebc9d8ac74092f7a2a5':
Remove <cutils/tztime.h>.
2014-07-24 23:18:34 +00:00
Tim Murray
c894ced183
Merge "Fix fastboot for Darwin."
2014-07-24 22:43:23 +00:00
Tim Murray
bd87944805
Fix fastboot for Darwin.
...
bug 16172793
Change-Id: Ib58446effc13a6e465d176da141b025d36841b8f
2014-07-24 19:27:37 -07:00
Tim Murray
1efcdeffe5
fix adb build on Darwin
...
bug 16172793
Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
2014-07-24 18:33:12 -07:00
Mark Salyzyn
914e36b919
am 74ee1c05: Merge "logcat: test: logrotate flags"
...
* commit '74ee1c05d4f942d5cf45c9fcbb6f0d6444fb1db6':
logcat: test: logrotate flags
2014-07-24 22:19:11 +00:00
Tim Murray
6698ebf928
Merge "Fix Darwin build caused by -Wunused-parameter."
2014-07-24 22:07:52 +00:00
Tim Murray
b37009fa77
Fix Darwin build caused by -Wunused-parameter.
...
bug 16172793
Change-Id: I1d0514c00085cb5d18ebdd064e96885d6eaa1e59
2014-07-24 17:22:09 -07:00
Tim Murray
83ddddaaba
am 4795ce06: Merge "Update makefiles for host clang."
...
* commit '4795ce066024c7ab235cb0c6bb229b0b6d9e5878':
Update makefiles for host clang.
2014-07-24 21:04:24 +00:00
Nick Kralevich
66083ae834
Merge "sdcard: ensure installd fs upgrade has completed"
2014-07-24 20:55:36 +00:00
Nick Kralevich
506edb5f7c
sdcard: ensure installd fs upgrade has completed
...
Before running the sdcard daemon, make sure that installd has
completed all upgrades to /data that it needs to complete.
This avoids race conditions between installd and the sdcard daemon.
Maybe fixes bug 16329437.
(cherrypicked from commit 8d28fa71fc )
Bug: 16329437
Change-Id: I5e164f08009c1036469f8734ec07cbae9c5e262b
2014-07-25 09:44:29 -07:00
Tim Murray
721f189a05
Merge "fix adb build on Darwin"
2014-07-24 20:55:36 +00:00
Tim Murray
4795ce0660
Merge "Update makefiles for host clang."
2014-07-24 20:55:36 +00:00
Nick Kralevich
c70ebca44c
am 6bc762b2: Merge "Add SELinux MAC to debuggerd."
...
* commit '6bc762b2a10bb13396f7e27d01d9ac7e8f725fbf':
Add SELinux MAC to debuggerd.
2014-07-24 20:27:55 +00:00
Tim Murray
06fce9db05
Update makefiles for host clang.
...
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-24 12:18:22 -07:00
Elliott Hughes
98e5f96842
am bf300e1e: Merge "Correction to TRACE format strings"
...
* commit 'bf300e1e04726528bf2fefac89e5e73aaff1d68e':
Correction to TRACE format strings
2014-07-24 18:53:21 +00:00
Elliott Hughes
525080910e
Merge "Silence healthd warnings."
2014-07-23 22:55:49 +00:00
Elliott Hughes
82044f843c
Silence healthd warnings.
...
Change-Id: I339cf62ce93cb268e00ba26f1c310d0586899476
2014-07-24 17:19:46 -07:00
Elliott Hughes
d629c7892f
Merge "Remove <cutils/tztime.h>."
2014-07-23 22:55:49 +00:00
Elliott Hughes
f2e4b411e6
Remove <cutils/tztime.h>.
...
Change-Id: I043c6686361bda9e85b82408511bf241a42b9229
2014-07-24 16:13:39 -07:00
Mark Salyzyn
74ee1c05d4
Merge "logcat: test: logrotate flags"
2014-07-23 22:55:49 +00:00
Mark Salyzyn
d03caa23dd
logcat: test: logrotate flags
...
- test -f -n and -r flags
- fix issue with parse error for sizes in bytes (no multiplier)
Bug: 16147190
Change-Id: Iadf2fd903d5e881d02f1d2b491441cc8090ee1c9
2014-07-24 22:14:11 +00:00
Neil Fuller
e91d9d80d1
Merge "Prevent the accidental closure of fd[0] for missing zip files."
2014-07-23 19:33:25 +00:00
Neil Fuller
b1a113f618
Prevent the accidental closure of fd[0] for missing zip files.
...
Bug: 16530747
Change-Id: I3593f2bc4d56a2f91252ea795c90ce3c78e1ec06
2014-07-25 16:06:20 +01:00
Nick Kralevich
6bc762b2a1
Merge "Add SELinux MAC to debuggerd."
2014-07-23 18:45:08 +00:00
Stephen Smalley
69b800391c
Add SELinux MAC to debuggerd.
...
debuggerd allows uid-0 processes to dump tombstones or backtraces
of any process, and uid-system processes to dump backtraces of any
processes. Restrict these operations via SELinux based on the
client context, the target process context, and the action.
Depends on I8e120d319512ff207ed22ed87cde4e0432a13dda for the
corresponding policy definitions.
Change-Id: Ib317564e54e07cc21f259e75124b762ad17c6e16
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-07-24 16:01:56 -04:00
Elliott Hughes
bf300e1e04
Merge "Correction to TRACE format strings"
2014-07-23 18:04:01 +00:00
Marcus Oakland
d33308752f
Correction to TRACE format strings
...
When built with "#define FUSE_TRACE 1" numerous TRACE statements
failed to compile because of mismatches between format strings and
types (uint64_t and size_t). These have been corrected by using the
format strings from the inttype.h header file, or %zu.
Change-Id: I36cd6f8da0790f1218d7dbaaa5b3bbfa4df7fdee
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-07-24 11:30:19 -07:00
Elliott Hughes
c9343cfe40
Merge "Refresh toolbox."
2014-07-23 17:53:27 +00:00
Elliott Hughes
fd4c6b0a3a
Refresh toolbox.
...
Use more upstream NetBSD, and update those things that were already NetBSD.
Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.
Bug: 16493461
Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
2014-07-24 17:20:51 -07:00
Stephen Hines
31dc191b2b
am 73290cd1: Merge "Remove invalid 64-bit host objects."
...
* commit '73290cd1369422260f1843dc36949c27422c0300':
Remove invalid 64-bit host objects.
2014-07-22 20:49:15 +00:00
Elliott Hughes
04857219b2
am 2fd1fec6: Merge "Switch to NetBSD\'s kill(1)."
...
* commit '2fd1fec6197e0ede7a404e106e3dc6ce226dca58':
Switch to NetBSD's kill(1).
2014-07-22 20:44:35 +00:00
Elliott Hughes
1ff2df3f64
am 82a2687a: Merge "Fix cp(1) for files in /proc."
...
* commit '82a2687a3c7eb39549b07153cf6a87ce5f3b507f':
Fix cp(1) for files in /proc.
2014-07-22 20:32:13 +00:00
Sreeram Ramachandran
1575e1639c
am 34627d82: Merge "Stop and start netd explicitly for "adb shell stop/start"."
...
* commit '34627d82d784ae2a71a1b2fc66e8eea5a25cd38d':
Stop and start netd explicitly for "adb shell stop/start".
2014-07-22 20:05:46 +00:00
Stephen Hines
73290cd136
Merge "Remove invalid 64-bit host objects."
2014-07-22 16:35:00 +00:00
Stephen Hines
03cc1f747c
Remove invalid 64-bit host objects.
...
Bug: 16408818
These targets are no longer in use, since we have a proper way to create both
32-bit and 64-bit host libraries in a single build now.
Change-Id: Icd09f795acd220de5b5e956a8d8e1b4ab4864fa9
2014-07-22 13:36:16 -07:00
Sreeram Ramachandran
34627d82d7
Merge "Stop and start netd explicitly for "adb shell stop/start"."
2014-07-22 16:35:00 +00:00
Elliott Hughes
2fd1fec619
Merge "Switch to NetBSD's kill(1)."
2014-07-22 16:25:43 +00:00
Elliott Hughes
5054c0db70
Switch to NetBSD's kill(1).
...
Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
2014-07-22 10:46:15 -07:00
Elliott Hughes
82a2687a3c
Merge "Fix cp(1) for files in /proc."
2014-07-22 16:18:32 +00:00
Elliott Hughes
1dc64f7a46
Fix cp(1) for files in /proc.
...
Also modernize the Android-specific hacks.
Bug: https://code.google.com/p/android/issues/detail?id=70793
Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
2014-07-22 13:27:16 -07:00