ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11186 commits 1 branch 0 tags 217 MiB
Commit graph

11186 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
29a34a5e7c Merge "Disable the static libcutils tests." 2014-11-14 21:38:07 +00:00
Christopher Ferris
0f2966a3ca resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. 
Change-Id: I9b542a0b1a2ae52c954b6b6995e6836c0c6713d3
 2014-11-14 12:59:52 -08:00
Christopher Ferris
514eefd53c am a46bf7eb: Merge "Convert futex to cond wait." 
* commit 'a46bf7eb686661bc8ace6c838e1e3004c993fb36':
  Convert futex to cond wait.
 2014-11-14 19:35:06 +00:00
Christopher Ferris
a46bf7eb68 Merge "Convert futex to cond wait." 2014-11-14 19:25:17 +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
Christopher Ferris
3cdbfdce6a Convert futex to cond wait. 
Switch to the better supported pthread_cond to handle the Wait/Wake
functions.

Also, increase the number of simultaneous threads in the thread tests.

Bug: 18381207

(cherry picked from commit db44538387)

Change-Id: Id326a7a7b92cb61573def3f761597c40f3ef2f4b
 2014-11-14 10:46:39 -08:00
Christopher Ferris
bc137cf4a3 Merge "Convert futex to cond wait." into lmp-mr1-dev 2014-11-14 18:35:14 +00:00
Christopher Ferris
db44538387 Convert futex to cond wait. 
Switch to the better supported pthread_cond to handle the Wait/Wake
functions.

Also, increase the number of simultaneous threads in the thread tests.

Bug: 18381207
Change-Id: I63240208e8b7f641b3f35a3fc0bb1acf80dc796e
 2014-11-13 20:37:22 -08:00
Daniel Rosenberg
28d0d868a4 am 323df093: Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev 
* commit '323df093c842e17b69d2be02462053697ef4d92e':
  property_service: Added vendor build properties to load_all_props
 2014-11-14 01:39:44 +00:00
Daniel Rosenberg
323df093c8 Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev 2014-11-14 01:08:17 +00:00
Andreas Gampe
de5fdd6773 am 6ef68b55: Merge "System/core: Use memmove" 
* commit '6ef68b55b77b199fdcef2822750a392e1d0a4b04':
  System/core: Use memmove
 2014-11-14 00:38:01 +00:00
Andreas Gampe
6ef68b55b7 Merge "System/core: Use memmove" 2014-11-14 00:28:03 +00: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
64d7117efc Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" 2014-11-14 00:17:19 +00:00
Sami Tolvanen
99184bab35 am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata 
* commit '72f0d92c722447e0c87cfe765516a7352db3d51a':
  DO NOT MERGE: Do not mount devices with invalid verity metadata
 2014-11-14 00:03:41 +00:00
Sami Tolvanen
2dfadac156 am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 
* commit '9573a13bbc015c555adff1e4e0fbef2a18963111':
  DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
 2014-11-14 00:03:40 +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
Andreas Gampe
dd060f01f6 System/core: Use memmove 
Should use memmove when you expect overlap.

Change-Id: I268a173db40a4be54232958e37aa8a03c2a885ee
 2014-11-13 15:50:17 -08:00
Chih-Hung Hsieh
509f1c9aee am 165238d8: Merge "Fix a trivial typo." 
* commit '165238d8deb41a10f909a61bfb7542c306594b69':
  Fix a trivial typo.
 2014-11-13 23:45:17 +00:00
Sami Tolvanen
72f0d92c72 DO NOT MERGE: Do not mount devices with invalid verity metadata 
The return value of read_verity_metadata is propagated to caller
even if the verity metadata is invalid, provided that it can be
read from the device. This results in devices with invalid verity
metadata signatures to be mounted normally, which is not desirable.
This change fixes the bug by changing the return value in case of
verification failure to FS_MGR_SETUP_VERITY_FAIL.

Bug: 15984840
Bug: 18120110
Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a
(cherry picked from commit c95e9da396)
 2014-11-13 15:43:08 -08:00
Sami Tolvanen
9573a13bbc DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 
Verity metadata signatures will be switched to SHA-256. Switch
fs_mgr signature verification to use the correct algorithm.

Needs matching changes from
  https://googleplex-android-review.git.corp.google.com/#/c/579905/
  https://googleplex-android-review.git.corp.google.com/#/c/583213/
  https://googleplex-android-review.git.corp.google.com/#/c/583214/
  https://googleplex-android-review.git.corp.google.com/#/c/583233/

Bug: 15984840
Bug: 18120110
Bug: 17917515
Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2
(cherry picked from commit a3465e250c)
 2014-11-13 15:42:50 -08:00
Chih-Hung Hsieh
165238d8de Merge "Fix a trivial typo." 2014-11-13 23:40:17 +00:00
Yabin Cui
30db2d2593 am c9582d02: Merge "kill HAVE_FORKEXEC" 
* commit 'c9582d02391393d38b511f8c58be5429bdcb0406':
  kill HAVE_FORKEXEC
 2014-11-13 23:35:24 +00:00
Chih-Hung Hsieh
2c776811a4 Fix a trivial typo. 
Clang compiler gave a correct warning on this mismatch of
names in #ifndef and #define.

Change-Id: I360f0c40ee98162093dde8f9815a02a54e5b2cb7
 2014-11-13 15:33:38 -08:00
Yabin Cui
c9582d0239 Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:14 +00:00
Dan Albert
d56c92b720 am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace." 
* commit 'a3f16f22dc9f68ae0a204cfb9159270a3291231f':
  Add LOCAL_MULTILIB := both to Darwin libbacktrace.
 2014-11-13 23:19:38 +00:00
Dan Albert
a3f16f22dc Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace." 2014-11-13 23:00:08 +00:00
Dan Albert
5570c9b174 Add LOCAL_MULTILIB := both to Darwin libbacktrace. 
This was previously set for libbacktrace_libc++, but apparently never
was for libbacktrace.

Change-Id: I85dc44b356710c6367f5cea3bc0a4d6c817ca202
 2014-11-13 14:55:06 -08:00
Daniel Rosenberg
4cf5297cc8 property_service: Added vendor build properties to load_all_props 
Signed-off-by: Daniel Rosenberg <drosen@google.com>

(cherry picked from commit b95122205d)

Bug: 18281574
Change-Id: Id1f1c4e9e0d1bfbcae3995fb7966d18bf7d6e06d
 2014-11-13 13:08:28 -08:00
Elliott Hughes
8822a81def am a78e1a74: Merge "Sdcard: Initialize the padding output value" 
* commit 'a78e1a741810bbeaea955f30e6b5b8aa6b4b3a6b':
  Sdcard: Initialize the padding output value
 2014-11-13 20:31:22 +00:00
Elliott Hughes
a78e1a7418 Merge "Sdcard: Initialize the padding output value" 2014-11-13 20:21:05 +00:00
Yabin Cui
5a8a016287 am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R" 
* commit '8f7fc8dfed9ab6615e4a906aaefdf0eadd31ea28':
  kill HAVE_LOCALTIME_R
 2014-11-13 19:17:59 +00:00
JP Abgrall
d707b7f993 am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()" 
* commit 'b0a10b53eeeef6428bd034e3097391e9a7a4788b':
  Fix segfault in get_character_device_symlinks()
 2014-11-13 19:10:18 +00:00
JP Abgrall
755b909920 am c325535d: Merge "Close fd on error path in do_mount()" 
* commit 'c325535d3de1d103d5d40c5267df9ff9325bb3e3':
  Close fd on error path in do_mount()
 2014-11-13 19:10:16 +00:00
Yabin Cui
8f7fc8dfed Merge "kill HAVE_LOCALTIME_R" 2014-11-13 19:08:51 +00:00
JP Abgrall
b0a10b53ee Merge "Fix segfault in get_character_device_symlinks()" 2014-11-13 18:24:07 +00:00
Tomasz Kondel
fca58f4b18 Fix segfault in get_character_device_symlinks() 
A segmentation fault will occur when strchr function returns NULL.

Change-Id: I76076acfff16056179bf24dff5df9f81d9a45125
 2014-11-13 18:23:34 +00:00
JP Abgrall
c325535d3d Merge "Close fd on error path in do_mount()" 2014-11-13 18:21:25 +00:00
Tomasz Kondel
bfdcc40bff Close fd on error path in do_mount() 
This fix closes a file descriptor before returning
error from do_mount()

Change-Id: Ib370229f16bf9ac385162d6b163cc5b079a1e73e
 2014-11-13 18:20:55 +00:00
Yabin Cui
8a98535bcb kill HAVE_LOCALTIME_R 
Bug: 18361583
Change-Id: Icdc745a5204bba26c6438d16ed38ec791e136163
 2014-11-13 10:11:23 -08:00
Daisuke Okitsu
19ec8860c1 Sdcard: Initialize the padding output value 
Add initialization of the output value in handle_write.
This value is referred to in FUSE so initialization is
necessary.

See also handle_open and handle_opendir.

Change-Id: I6507f113da9f6823fbfa459624d6594fc20afa51
 2014-11-13 10:51:07 +01:00
Yabin Cui
e77b6a0862 kill HAVE_FORKEXEC 
Bug: 18317407
Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
 2014-11-12 17:06:27 -08:00
Dan Albert
9b5b2d2c23 am ca1797ae: Merge "Remove the stlport linked libbacktrace." 
* commit 'ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346':
  Remove the stlport linked libbacktrace.
 2014-11-12 22:21:47 +00:00
Dan Albert
ca1797ae00 Merge "Remove the stlport linked libbacktrace." 2014-11-12 22:12:34 +00: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
06279285ae Merge "Revert "Move some tests to libc++."" 2014-11-12 05:43:55 +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
4e47296686 am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++." 
* commit '5c7e2e603079c611b99302e5898b443440f2d9d7':
  Move liblog tests and benchmarks to libc++.
 2014-11-12 03:54:34 +00:00
Dan Albert
5c7e2e6030 Merge "Move liblog tests and benchmarks to libc++." 2014-11-12 03:44:42 +00:00