Dmitriy Ivanov
cb8c583d49
Merge "Fix ps <process name>"
2014-11-03 16:13:30 +00:00
Dmitriy Ivanov
65267bcc27
Fix ps <process name>
...
Use /proc/pid/cmdline instead of /proc/pid/stat
to filter process by name.
Bug: 8638853
Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
2014-11-03 01:28:31 -08:00
Nick Kralevich
c6dead707d
Merge "maybe fix mac build"
2014-11-02 14:16:20 +00:00
Nick Kralevich
bcd1a834d4
maybe fix mac build
...
system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error: use of undeclared identifier 'ENOENT'
ASSERT_EQ(ENOENT, errno);
Change-Id: I188074b878a7ec3955a9f4b5dc7d1bfc56e2ccbc
2014-11-02 06:13:53 -08:00
Ian Rogers
b968d5c846
Merge "Add shared library version of libziparchive."
2014-10-30 18:05:55 +00:00
Ian Rogers
40ac96c72c
Add shared library version of libziparchive.
...
Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
2014-10-30 09:53:38 -07:00
Aristidis Papaioannou
91b76d7de3
Merge "Made suffix length of rotated logcat files constant."
2014-10-29 15:28:52 +00:00
Aristidis Papaioannou
eba7344fc1
Made suffix length of rotated logcat files constant.
...
The suffix now uses as many digits as needed to cover the maximum number
of rotated files.
eg, for 20 files it would use 2 digits: log_file.{01,02,03,...,20}
Change-Id: I4709b3cf4bf88c209db3c4d9e24a3a4731c98bae
2014-10-29 15:00:54 +00:00
Calin Juravle
649891267f
Merge "Add code cache tests to libnativebridge."
2014-10-28 16:06:15 +00:00
Calin Juravle
59a719c466
Add code cache tests to libnativebridge.
...
Bug: 18027433
Change-Id: Ie5369c0d5bd147af412174dc0753d8a314196643
2014-10-28 16:02:38 +00:00
Narayan Kamath
8cf2ce1064
Merge "Don't allow SUPPORTED_ABIs to be set by the native bridge."
2014-10-27 16:16:02 +00:00
Calin Juravle
e3c22c416f
Merge "Handle code_cache dir creation in libnativebridge"
2014-10-27 15:15:39 +00:00
Calin Juravle
f9d9e2a2d9
Handle code_cache dir creation in libnativebridge
...
Also:
- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with
Bug: 18027433
Bug: 18097480
Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
2014-10-27 15:03:13 +00:00
Chih-Hung Hsieh
d88323b266
Merge "Add volatile to avoid clang optimization."
2014-10-24 03:03:20 +00:00
Chih-Hung Hsieh
a1ff475b07
Add volatile to avoid clang optimization.
...
BUG: 18108178
Change-Id: Ie5b8b1808fcf6d1eacc14a7c6ac0c8d49641fec2
2014-10-23 16:50:51 -07:00
Chih-Hung Hsieh
5bea7edddd
Merge "Fix type cast error, should be char* not void*."
2014-10-23 22:59:03 +00:00
Chih-Hung Hsieh
dc61d77872
Fix type cast error, should be char* not void*.
...
BUG: 18106835
Change-Id: Ic0051d5035e5684de0091cd3528d65e1b1e57161
2014-10-23 15:25:28 -07:00
Narayan Kamath
dd22aeff73
Don't allow SUPPORTED_ABIs to be set by the native bridge.
...
SUPPORTED_ABIs is a prioritized list of all ABIs a device
support, and must not vary depending on whether or not an app
is emulated.
bug: 18061712
(cherry picked from commit 66f0d93c26
)
Change-Id: I99cea3a56228dac43ae310c295881881e5a77c31
2014-10-22 18:56:32 +01:00
Nick Kralevich
c0b4b8b0f1
Merge "Ensure /data/adb exists"
2014-10-21 17:01:40 +00:00
Nick Kralevich
89252ce31a
Ensure /data/adb exists
...
Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.
Bug: https://code.google.com/p/android/issues/detail?id=72895
Change-Id: I9cee2a0202417ff72a5ede7742e25877f51732dd
2014-10-21 16:16:39 +00:00
JP Abgrall
951c48c504
Merge "adb: Add USB vendor ID for TrekStor GmbH"
2014-10-20 18:11:10 +00:00
Thorsten Koroscha
4fa99e542f
adb: Add USB vendor ID for TrekStor GmbH
...
Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9
Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
2014-10-20 10:26:20 +02:00
Chih-hung Hsieh
3a38717691
Merge "Don't build init with clang for now"
2014-10-16 16:22:03 +00:00
Chih-Hung Hsieh
7979f1ce5f
Merge "Do not inline rarely used trace function bodies."
2014-10-15 17:49:03 +00:00
Mark Salyzyn
a8aad1667f
Merge "logd: insert order for first entry"
2014-10-14 23:57:33 +00:00
Mark Salyzyn
eae155e1ce
logd: insert order for first entry
...
Change-Id: I39e8e6d32407a1796a0c3a121f9dc4dc5402c3df
2014-10-14 23:57:13 +00:00
Chih-Hung Hsieh
2d3150e736
Do not inline rarely used trace function bodies.
...
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.
BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Dmitriy Ivanov
e63fb8bd80
Merge "Remove libsigchain from LD_PRELOADs"
2014-10-14 17:39:22 +00:00
Riley Andrews
3bcd569490
Merge "Add gtest conformance tests for libsync."
2014-10-11 19:40:32 +00:00
Riley Andrews
d0d7f6ac08
Add gtest conformance tests for libsync.
...
Not complete yet, but substantially more comprehensive than the
interactive test that was there before.
(cherry-picked from internal master, same change-id).
Change-Id: I9019b0a8babbc91f78aa850e0e288bbf05f93500
2014-10-11 02:10:23 +00:00
Mark Salyzyn
6b66025f6f
Merge "fs_mgr: fix build breakage"
2014-10-09 14:14:55 +00:00
Mark Salyzyn
89fa114e2a
fs_mgr: fix build breakage
...
Some compilers are not as smart as other compilers
Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
2014-10-08 16:43:47 -07:00
Elliott Hughes
47d2441657
Merge "Fix top for very large VSS."
2014-10-08 18:20:31 +00:00
Elliott Hughes
052d78f334
Fix top for very large VSS.
...
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
2014-10-08 11:20:03 -07:00
Dmitriy Ivanov
c9f9f35efa
Remove libsigchain from LD_PRELOADs
...
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-07 13:39:02 -07:00
Mark Salyzyn
a083c8578a
Merge changes I7d0b85b5,I74796043
...
* changes:
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:23:46 +00:00
Mark Salyzyn
f48ea7c8dc
logd: LogStatistics leak
...
- uid = -1 in subtract operation to match add
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
2014-10-06 22:43:56 +00:00
Mark Salyzyn
df5aa61f05
logd: kill(0,0) issue
...
- Recognize pid=0 as special case (kernel or pre-init sourced)
and refrain from treating it in the general case.
Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
2014-10-06 22:43:46 +00:00
Mark Salyzyn
09dc063319
Merge changes I74796043,I74796043
...
* changes:
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 22:43:26 +00:00
Mark Salyzyn
f5fc509589
logd: Add control statistics enable/disable.
...
- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override
Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
2014-10-06 22:42:47 +00:00
Mark Salyzyn
e72c6e4366
logd: cleanup
...
- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
2014-10-06 22:42:07 +00:00
Chih-Hung Hsieh
4fceda2b53
Merge "Add -no-integrated-as at local level."
2014-10-06 22:02:06 +00:00
Chih-Hung Hsieh
60c57dad4e
Add -no-integrated-as at local level.
...
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
2014-10-06 13:33:25 -07:00
Elliott Hughes
b1dd4af7c4
Merge "Fix a typo in ioctl usage message."
2014-10-06 17:12:01 +00:00
Elliott Hughes
a0d61ba3e9
Fix a typo in ioctl usage message.
...
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Hans Boehm
41198eea42
Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa
Revert "Rewrite atomic.h to use stdatomic.h."
...
This reverts commit cb344d4640
.
Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
028928fe3c
Merge "Rewrite atomic.h to use stdatomic.h."
2014-10-03 23:47:36 +00:00
Bernhard Rosenkraenzer
84e07fb7a4
Don't build init with clang for now
...
init doesn't start when built with clang.
Set LOCAL_CLANG:=false until this is analyzed and fixed.
Change-Id: I5a7944aef676ce88defe5c0449e712d9812fb5f3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-10-04 01:36:49 +02:00
Calin Juravle
c60836263e
Merge "Use initUnchangeableSystemProperty for initializing os.arch."
2014-10-02 17:28:39 +00:00