Elliott Hughes
227f8bf147
Merge "Clean up adb Win32 symlink #ifdefs."
2015-01-13 01:05:20 +00:00
Elliott Hughes
0a049b1d8d
Clean up adb Win32 symlink #ifdefs.
...
Change-Id: I83ef30e82d820f91960c29f6b737e6e900caaca6
2015-01-12 17:00:09 -08:00
Elliott Hughes
ec556521e2
Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
2015-01-12 22:16:57 +00:00
Elliott Hughes
ae52165490
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
...
Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
2015-01-12 13:56:34 -08:00
Elliott Hughes
9da414f95e
Merge "Linux always has POSIX clocks available."
2015-01-10 00:34:15 +00:00
Elliott Hughes
76f0a84f6a
Linux always has POSIX clocks available.
...
pixelflinger doesn't have to run on the Mac, but the Condition
code might.
Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
2015-01-09 16:17:46 -08:00
Elliott Hughes
4c6c6d1c7e
Merge "You either have winsock or <sys/sockets.h>."
2015-01-09 21:52:15 +00:00
Elliott Hughes
3906c8511e
You either have winsock or <sys/sockets.h>.
...
There is no third choice.
Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
2015-01-09 12:21:51 -08:00
Jesse Hall
7208a01514
Merge "Mutex: add timedLock() method"
2015-01-07 18:01:11 +00:00
Jesse Hall
601424a84f
Mutex: add timedLock() method
...
This is not available for host builds because OSX doesn't have
pthread_mutex_timedlock() or equivalent.
Bug: 18842510
Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
2015-01-07 08:06:51 -08:00
Yabin Cui
fdb3da5953
Merge "Use getmntent when accessing /proc/mounts."
2015-01-06 17:41:40 +00:00
Sami Tolvanen
4f8fa5ba3c
Merge "Fix disable-verity when the underlying block device is RO"
2015-01-06 11:12:42 +00:00
Yabin Cui
d6bd9bf459
Use getmntent when accessing /proc/mounts.
...
Bug: 18887435
Change-Id: I6d7f95bbdb976428d4722bd640745e73c9839160
2015-01-05 20:28:36 -08:00
Sami Tolvanen
13449cd714
Fix disable-verity when the underlying block device is RO
...
If verity is enabled and the underlying block device is marked
read-only, disable-verity fails. We cannot use the existing code
for enable-verity to make the device writable as the device in
/proc/mounts will be the verity device instead of the underlying
device we want to change. This change makes the correct device
writable when altering verity state.
Change-Id: I423ee50fb34d78cff2fe843318b9081c03c5142d
2015-01-05 20:31:25 +00:00
Mark Salyzyn
e892279b3a
Merge "liblog: Add log_time += operator"
2015-01-05 20:18:24 +00:00
Mark Salyzyn
decd92945f
liblog: Add log_time += operator
...
Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
2015-01-05 16:27:54 +00:00
Elliott Hughes
69159ba0b7
Merge "Fix missing #includes in system/core."
2014-12-29 21:17:41 +00:00
Elliott Hughes
0badbd6565
Fix missing #includes in system/core.
...
Change-Id: I4736e8c4f7bb8bb03640d26d58243efaa67dc75c
2014-12-29 12:24:25 -08:00
Elliott Hughes
2978ad4c6d
Merge "Remove two obsolete files."
2014-12-24 19:55:24 +00:00
Elliott Hughes
2215309987
Remove two obsolete files.
...
Change-Id: I3e40dc713435f5c653c1aff28a450fd3fb75055c
2014-12-24 11:52:50 -08:00
Elliott Hughes
d106305f67
Merge "Lose getenforce and setenforce to toybox."
2014-12-24 19:40:54 +00:00
Elliott Hughes
2e67705cff
Lose getenforce and setenforce to toybox.
...
Change-Id: Ie03161cc2d6ae410e079e1142e62e6836858c9db
2014-12-24 11:31:14 -08:00
Elliott Hughes
dbe4975791
Merge "Lose netstat to toybox."
2014-12-23 18:30:38 +00:00
Elliott Hughes
7e3879e467
Lose netstat to toybox.
...
Change-Id: I165ff67fc47286b992f167ff7392246a805b6d68
2014-12-23 09:13:33 -08:00
Elliott Hughes
4d1d2cae1c
Merge "#include <arpa/inet.h> for htonl."
2014-12-18 23:49:39 +00:00
Elliott Hughes
c184d5655a
#include <arpa/inet.h> for htonl.
...
Not sure why this only shows up with clang.
Change-Id: Id5603483e32f8a8d4b091dbb31b3142e3f77deac
2014-12-18 23:49:17 +00:00
Chih-Hung Hsieh
d06e8921bf
Merge "Disable clang optimization that has segmentation fault."
2014-12-18 00:01:45 +00:00
Chih-Hung Hsieh
c83d3a3b65
Disable clang optimization that has segmentation fault.
...
When compiling for aosp_fugu-userdebug, clang aborted in pass:
Running pass 'Function Pass Manager' on module 'system/core/libmincrypt/p256_ec.c'.
Running pass 'X86 DAG->DAG Instruction Selection' on function '@felem_square'
BUG: 18790528
Change-Id: I416c07cae4c1a9743655bc45bd33c10a5cc9b41f
2014-12-17 14:59:53 -08:00
Elliott Hughes
12677383ae
Merge "Lose mv to toybox."
2014-12-17 04:16:14 +00:00
Elliott Hughes
a264cca35a
Lose mv to toybox.
...
Change-Id: Ibbba4d516d55460c6d627b766cc087e6a7edcabd
2014-12-16 19:20:10 -08:00
Elliott Hughes
300a85e5a7
Merge "Lose rm to toybox."
2014-12-17 01:26:20 +00:00
Elliott Hughes
fdab0f5be5
Lose rm to toybox.
...
Change-Id: I93904b85e180d4324b64e2e90a4832c4d4169627
2014-12-16 16:22:54 -08:00
Elliott Hughes
cc825ae792
Merge "Lose cp to toybox."
2014-12-17 00:17:51 +00:00
Elliott Hughes
b3fa82607c
Lose cp to toybox.
...
Change-Id: Idfe52737093d243ae2dcb054f686f6d6af0c2de6
2014-12-16 16:15:32 -08:00
Elliott Hughes
700a957070
Merge "Lose ln to toybox."
2014-12-17 00:11:23 +00:00
Elliott Hughes
ae96efca51
Lose ln to toybox.
...
I accidentally enabled the toybox ln in my original commit, so which ln
you've been running for the last few weeks has depended on which directory
you built more recently...
Change-Id: If73783477aa4eb4d058d6e170d6291ba0d9c5f40
2014-12-16 15:38:04 -08:00
Elliott Hughes
a7e6dbd3c2
Merge "Lose rmdir to toybox."
2014-12-16 23:31:34 +00:00
Elliott Hughes
ff60f7c94a
Lose rmdir to toybox.
...
Change-Id: I80ecc7c19bf7fc44039235c846727853d78a5d15
2014-12-16 15:28:03 -08:00
Elliott Hughes
8dc9777b33
Merge "Lose mkdir to toybox."
2014-12-16 23:25:12 +00:00
Elliott Hughes
de4fd83e0b
Lose mkdir to toybox.
...
Change-Id: Ie2ad916893ba36e7cee6d5a4533e60732871c8dd
2014-12-16 15:18:56 -08:00
Elliott Hughes
8641daeea1
Merge "Lose chcon to toybox."
2014-12-16 17:25:00 +00:00
Elliott Hughes
2f5d6d3d1c
Lose chcon to toybox.
...
Change-Id: I9ae70ff53da6e31ccb1c4e127ce9349ab794f78f
2014-12-16 09:18:50 -08:00
Elliott Hughes
0e74cfb677
Merge "Fix references to HAVE_PRCTL."
2014-12-15 23:09:49 +00:00
Elliott Hughes
292ccd3c18
Fix references to HAVE_PRCTL.
...
Change-Id: I8343b398f2ce0d743487fdd086e67763c7dd67f1
2014-12-15 12:52:53 -08:00
Elliott Hughes
fae953ebcc
Merge "HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>."
2014-12-15 01:40:53 +00:00
Elliott Hughes
6acf3d7703
HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>.
...
Change-Id: Ica7940c00d1d5da9d50711fd138dd459deec9b6d
2014-12-14 16:51:36 -08:00
Chih-hung Hsieh
48d7489e85
Merge "Fix build with clang"
2014-12-13 00:06:58 +00:00
Bernhard Rosenkränzer
2bd4124259
Fix build with clang
...
Remove 2 unused functions and 1 unused label in the
!ALLOW_ADBD_DISABLE_VERITY case
Change-Id: Id6b29f57bcb95e54f5a4014021d47d8ca6e4556e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-12 15:48:52 -08:00
Riley Andrews
53432b46fa
Merge "fix memory leak in copy_remote_dir_local"
2014-12-12 22:05:31 +00:00
Riley Andrews
4d04d24b9e
fix memory leak in copy_remote_dir_local
...
Bug https://code.google.com/p/android/issues/detail?id=82436
Change-Id: I4bfa865638742e1b7cedd17f5b33dcc10c7f711c
2014-12-12 22:03:14 +00:00