Elliott Hughes
4d9ddb14c0
am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
...
* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
2015-01-12 22:28:11 +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
Yabin Cui
28175b0221
am fdb3da59: Merge "Use getmntent when accessing /proc/mounts."
...
* commit 'fdb3da5953b70dc87a05d28c31cb0dc06b8181aa':
Use getmntent when accessing /proc/mounts.
2015-01-06 18:17:41 +00:00
Yabin Cui
d6bd9bf459
Use getmntent when accessing /proc/mounts.
...
Bug: 18887435
Change-Id: I6d7f95bbdb976428d4722bd640745e73c9839160
2015-01-05 20:28:36 -08:00
Elliott Hughes
f8328e7744
am 0e74cfb6: Merge "Fix references to HAVE_PRCTL."
...
* commit '0e74cfb677319c0f006dcc81f74fb21956807d2a':
Fix references to HAVE_PRCTL.
2014-12-15 23:19:51 +00:00
Elliott Hughes
292ccd3c18
Fix references to HAVE_PRCTL.
...
Change-Id: I8343b398f2ce0d743487fdd086e67763c7dd67f1
2014-12-15 12:52:53 -08:00
Elliott Hughes
27484f2e74
am fae953eb: Merge "HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>."
...
* commit 'fae953ebccfabfa500b3ebca93202063c8e3501d':
HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>.
2014-12-15 02:00:31 +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
Andreas Gampe
422ced07e5
am 374de72b: Merge "Libcutils: Remove unused variable"
...
* commit '374de72bbc218198e6a5f09ae4da853d02199b5c':
Libcutils: Remove unused variable
2014-11-25 18:51:52 +00:00
Andreas Gampe
50c15f980d
Libcutils: Remove unused variable
...
For build-system CFLAGS clean-up, remove unused variable.
Change-Id: Iaf6dd7b84ee4ef4734a48b37a4d0ca8287ca5fb5
2014-11-24 10:04:56 -08:00
Elliott Hughes
88cc0aded6
am eda16b98: Merge "Kill LOCAL_SOCKET_NAMESPACE."
...
* commit 'eda16b98dce3ef4c75b7b46c6acdab2b6970f54a':
Kill LOCAL_SOCKET_NAMESPACE.
2014-11-22 07:56:37 +00:00
Elliott Hughes
9768d24fa0
Kill LOCAL_SOCKET_NAMESPACE.
...
Change-Id: I18928f89f66c37be310c45ff4c05a6d47ab84f66
2014-11-21 22:50:20 -08:00
Elliott Hughes
ba96de5f65
am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
...
* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
Remove the error-prone TARGET_CPU_SMP from system/core.
2014-11-17 19:40:16 +00:00
Elliott Hughes
e9ca709a73
Remove the error-prone TARGET_CPU_SMP from system/core.
...
This means that code that uses libcutils no longer has to ensure that
it's set ANDROID_SMP in the calling code's Android.mk for this to
function correctly.
Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
2014-11-17 11:16:59 -08:00
Dan Albert
a57aacbaef
am 29a34a5e: Merge "Disable the static libcutils tests."
...
* commit '29a34a5e7c249046a995a140ba30fa10960c7d42':
Disable the static libcutils tests.
2014-11-14 21:47:40 +00:00
Dan Albert
bb28776db0
Disable the static libcutils tests.
...
The static libcutils tests cannot be built when using libc++ because
there are multiple symbol definition errors between libc++ and libgcc.
Bug: 18389856
Change-Id: I6f41c561f97b3a37477f844e9abf6551524a0fa3
2014-11-14 10:56:34 -08:00
Hans Boehm
0b7f368442
am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""
...
* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
Second attempt to "Rewrite atomic.h to use stdatomic.h."
2014-11-14 00:26:51 +00:00
Hans Boehm
c56648948c
Second attempt to "Rewrite atomic.h to use stdatomic.h."
...
This should not be committed until win_sdk and aarch64 builds are
fixed in the presence of this CL.
This reverts commit 2789faabfa .
We additionally remove uniprocessor support from the earlier CL,
thus avoiding a potential compiler code reordering issue.
Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
2014-11-13 15:59:10 -08:00
Dan Albert
21d8d89c7c
am 06279285: Merge "Revert "Move some tests to libc++.""
...
* commit '06279285ae38b58988a9431c89b8689d8e16904e':
Revert "Move some tests to libc++."
2014-11-12 05:50:56 +00:00
Dan Albert
1d3b492bde
Revert "Move some tests to libc++."
...
The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.
This reverts commit e3cccbfd47 .
2014-11-11 21:42:27 -08:00
Dan Albert
498c8135b4
am 7d196df6: Merge "Move some tests to libc++."
...
* commit '7d196df6f9990b5c93e0661fb0867971da7e6c34':
Move some tests to libc++.
2014-11-12 02:52:59 +00:00
Dan Albert
e3cccbfd47
Move some tests to libc++.
...
Bug: 15193147
Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
2014-11-11 23:59:02 +00:00
Elliott Hughes
aeac9cd1b3
am 85507404: Merge "Remove dead code."
...
* commit '855074043144e74156972e7a3416808dc6696452':
Remove dead code.
2014-11-08 20:11:53 +00:00
Elliott Hughes
9a092dd373
Remove dead code.
...
__APPLE__ => HAVE_FUNOPEN.
Change-Id: I191cccd9b75020ffbb3281283ce1f1b7abc15d22
2014-11-08 11:32:07 -08:00
Michael Lentine
98a51de1cc
Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-dev
...
automerge: b542285
* commit 'b5422854361be038b812f1c0272c66cdb4618a4b':
Fix native_handle_create to check if malloc fails
2014-11-04 00:04:42 +00:00
Michael Lentine
2b8852dece
Fix native_handle_create to check if malloc fails
...
Bug: 18076253
Change-Id: I8dbe3af88f52f18f74a3ab857fea53ae7585e2f7
2014-11-03 13:48:15 -08:00
Chih-Hung Hsieh
6ea35520fd
am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
...
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
c37387a4cd
am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
...
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +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
Riley Andrews
d1380d645d
am 33b33549: Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev
...
* commit '33b335495c7b8eea4b9af13a7157cf83cd085129':
Make the default cgroup, the foreground cgroup.
2014-10-08 20:51:48 +00:00
Riley Andrews
522d72b702
Make the default cgroup, the foreground cgroup.
...
All kernel services will now be in the same cgroup as
foreground applications. This will now make kernel threads
not implicitly higher priority than android foreground
services.
Bug 17681097
Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
2014-10-07 19:24:54 +00:00
Chih-Hung Hsieh
ddb3fe8c17
am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
...
* commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36':
Add -no-integrated-as at local level.
2014-10-06 22:37:48 +00:00
Chih-Hung Hsieh
2aaccfe590
am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
...
* commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36':
Add -no-integrated-as at local level.
2014-10-06 22:37: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
Hans Boehm
f381920b58
am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
...
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:17:43 +00:00
Hans Boehm
054627df6b
am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
...
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +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
954fc61b6b
am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
...
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:45 +00:00
Hans Boehm
2ac8207e50
am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
...
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:30 +00:00
Hans Boehm
cb344d4640
Rewrite atomic.h to use stdatomic.h.
...
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.
Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
Dan Albert
c4affb2b4e
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."
...
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
Don't manually link stlport.
2014-09-26 19:53:04 +00:00
Dan Albert
31171b6e31
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."
...
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
Don't manually link stlport.
2014-09-26 19:53:04 +00:00
Dan Albert
b50af2bc60
Don't manually link stlport.
...
Change-Id: I60d2bc868fb9052f120103e9675046ef54f510d0
2014-09-26 10:37:30 -07:00
Elliott Hughes
f9cdbb1a30
am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '6c03b85f1dcfd0efd2ec741cbfb6c5ecc404fbd8':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:23:47 +00:00
Elliott Hughes
bdac720255
am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '6c03b85f1dcfd0efd2ec741cbfb6c5ecc404fbd8':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:23:08 +00:00
Varvara Rainchik
458d1253f5
Clean up memset[16,32] routines: unify files names, remove redundant wrapper
...
for 32-bit, remove Atom caches sizes for 64-bit, fix license.
Change-Id: Ieda6367d7b21cf25b2beda6dd8d77cf668d3f2af
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
2014-09-17 18:11:18 +04:00
Christopher Ferris
6bcc4acc6f
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
(cherry picked from commit a9fa7b87f1 )
Change-Id: I3c9e0212c8720877a6af092071a3695df2a36df8
2014-09-13 16:22:17 -07:00
Christopher Ferris
07bb3f1e0b
am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
...
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
Use the correct debuggerd given the tid.
2014-09-13 22:54:00 +00:00
Christopher Ferris
a9fa7b87f1
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
2014-09-12 20:12:11 -07:00
Dan Albert
fb1b6daca8
am 522c1d34: am e18ed89e: Merge "Remove makefile cruft."
...
* commit '522c1d340b6c1742d3e47aad27b974e43fad4bc2':
Remove makefile cruft.
2014-09-12 20:08:49 +00:00