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

11203 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3ef0460e86 Merge "Remove the error-prone TARGET_CPU_SMP from system/core." 2014-11-17 19:29:04 +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
Nick Kralevich
33aacf1963 Introduce "adb keygen" 
automerge: 86c9e5f

* commit '86c9e5f7e20a3f1712038ce642628c2e1e866434':
  Introduce "adb keygen"
 2014-11-17 18:56:25 +00:00
Marco Nelissen
52b8898056 am e11d81b3: Merge "Update calls to IInterface::asBinder()" 
* commit 'e11d81b37c119ec3d67c1fe60779d510d21e6a14':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:57 +00:00
Marco Nelissen
e11d81b37c Merge "Update calls to IInterface::asBinder()" 2014-11-17 18:14:37 +00:00
Marco Nelissen
99f00d5ff3 Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:06:42 -08:00
Dan Albert
1ef4cf5f6d am e90159b0: Merge "Move debuggerd to libc++." 
* commit 'e90159b070a773fa33fdbb2aaf2f84ac0189f699':
  Move debuggerd to libc++.
 2014-11-16 09:57:19 +00:00
Dan Albert
f6f091a509 am 917d6f4c: Merge "Move libutils to libc++." 
* commit '917d6f4c73f7856adf4f369a675aeccfe42d746b':
  Move libutils to libc++.
 2014-11-16 09:57:18 +00:00
Dan Albert
e90159b070 Merge "Move debuggerd to libc++." 2014-11-16 01:08:43 +00:00
Dan Albert
917d6f4c73 Merge "Move libutils to libc++." 2014-11-16 01:08:25 +00:00
Dan Albert
80b88cb5d2 Move debuggerd to libc++. 
Bug: 15193147
Change-Id: I935a08e98077b688d1735fb5b84a615cb7df8810
 2014-11-15 16:35:30 -08:00
Dan Albert
890442a02d Move libutils to libc++. 
Bug: 15193147
Change-Id: I85aff3bcabb5ee3c8be9918b7bef0fd1bbfa98e3
 2014-11-15 16:32:26 -08:00
Dan Albert
9f5f81bfa2 am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests." 
* commit '133b7d4a84e6fd257bc1365b623415d41d8ebe2f':
  Don't manually link libgtest_main in libion tests.
 2014-11-14 21:47:41 +00: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
133b7d4a84 Merge "Don't manually link libgtest_main in libion tests." 2014-11-14 21:38:17 +00:00
Dan Albert
29a34a5e7c Merge "Disable the static libcutils tests." 2014-11-14 21:38:07 +00:00
Nick Kralevich
86c9e5f7e2 Introduce "adb keygen" 
Introduce the "adb keygen" command.

  Usage: adb keygen <filename>

This command creates an adb public/private key pair in a user
specified file. This can be used to create new adb keys, or rotate
existing keys.

Modify adb's key generation routines to use the HOSTNAME/LOGNAME
environment variables if available. This allows someone to override
the username/hostname embedded within the adb public key file if
desired. Fallback to the old mechanisms if those environment
variables aren't available.

Bug: 18342715
Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a

(cherry picked from commit af782b9f2a)

Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
 2014-11-14 21:09:48 +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
abe8d148b9 Don't manually link libgtest_main in libion tests. 
This is actually probably broken right now, since these tests are
getting both the libc++ flavor and stlport flavor of libgtest_main.

Bug: 15193147
Change-Id: Ic2f8dda98240c12591803f3c3522505314a05609
 2014-11-14 11:00:46 -08: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