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

11579 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
bfb5239393 am 23ac318d: am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed" 
* commit '23ac318d566df4b7397388ba1280899680414150':
  toolbox: indicate why swap{on|off} failed
 2014-11-18 20:21:26 +00:00
Yabin Cui
bd51f58e08 am 0aa45710: am 6a56ad28: Merge "kill HAVE_TERMIO_H" 
* commit '0aa45710d5c850bf673b14cf4894cee8eb43ce9b':
  kill HAVE_TERMIO_H
 2014-11-18 20:19:12 +00:00
Elliott Hughes
23ac318d56 am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed" 
* commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca':
  toolbox: indicate why swap{on|off} failed
 2014-11-18 18:06:06 +00:00
Elliott Hughes
91cb2cb341 Merge "toolbox: indicate why swap{on|off} failed" 2014-11-18 17:57:59 +00:00
Yabin Cui
0aa45710d5 am 6a56ad28: Merge "kill HAVE_TERMIO_H" 
* commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22':
  kill HAVE_TERMIO_H
 2014-11-18 02:32:53 +00:00
Yabin Cui
6a56ad28c3 Merge "kill HAVE_TERMIO_H" 2014-11-18 02:22:38 +00:00
Yabin Cui
d325e866c4 kill HAVE_TERMIO_H 
Bug: 18398307
Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
 2014-11-17 18:19:11 -08:00
Elliott Hughes
7320cd6123 am 83ebca02: am ac252357: Merge "Remove atomic-inline.h." 
* commit '83ebca02903b9c17f6a8d56257bb46db94ed268c':
  Remove atomic-inline.h.
 2014-11-17 23:20:55 +00:00
Elliott Hughes
83ebca0290 am ac252357: Merge "Remove atomic-inline.h." 
* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.
 2014-11-17 23:16:44 +00:00
Elliott Hughes
ac252357bb Merge "Remove atomic-inline.h." 2014-11-17 23:08:42 +00:00
Elliott Hughes
c3914d2be2 Remove atomic-inline.h. 
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
 2014-11-17 14:38:56 -08:00
Elliott Hughes
98c58699f9 am ba96de5f: am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core." 
* commit 'ba96de5f65101e8aa04f36c028551dcf08211eae':
  Remove the error-prone TARGET_CPU_SMP from system/core.
 2014-11-17 20:26:18 +00: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
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
b06dc4a42e am 33aacf19: Introduce "adb keygen" automerge: 86c9e5f 
* commit '33aacf1963dd1914c0ff94c4ddd05f729cdba3b6':
  Introduce "adb keygen"
 2014-11-17 19:00:16 +00:00
Nick Kralevich
33aacf1963 Introduce "adb keygen" 
automerge: 86c9e5f

* commit '86c9e5f7e20a3f1712038ce642628c2e1e866434':
  Introduce "adb keygen"
 2014-11-17 18:56:25 +00:00
Marco Nelissen
95f56b8e7b am 52b88980: am e11d81b3: Merge "Update calls to IInterface::asBinder()" 
* commit '52b88980564b6f0f1f8b9ceb1eebb80204bab29e':
  Update calls to IInterface::asBinder()
 2014-11-17 18:34:11 +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
c3012544e2 am 1ef4cf5f: am e90159b0: Merge "Move debuggerd to libc++." 
* commit '1ef4cf5f6d76339e30139c05c61296e0b2cc2dad':
  Move debuggerd to libc++.
 2014-11-16 15:39:53 +00:00
Dan Albert
6fb1755581 am f6f091a5: am 917d6f4c: Merge "Move libutils to libc++." 
* commit 'f6f091a509be4177df4be9a3b6d6b11a15a45de4':
  Move libutils to libc++.
 2014-11-16 15:39:52 +00: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
Marco Nelissen
26279a9ef1 Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Idcf82bb8c0b4b141475abb5330b08409dc14a600
 2014-11-14 14:01:40 -08:00
Dan Albert
2dd1bbacde am 9f5f81bf: am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests." 
* commit '9f5f81bfa2c7eb581fd6b2c735ac143fca07e70e':
  Don't manually link libgtest_main in libion tests.
 2014-11-14 21:55:42 +00:00
Dan Albert
8552b0ab0f am a57aacba: am 29a34a5e: Merge "Disable the static libcutils tests." 
* commit 'a57aacbaef0aa178e40887837fbe1ff09df0bf55':
  Disable the static libcutils tests.
 2014-11-14 21:55:41 +00: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
ba5490237c am 0f2966a3: resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. 
* commit '0f2966a3cac3cfcd53fe09e8b2b6e60b5c5958f1':
  Convert futex to cond wait.
 2014-11-14 21:04:55 +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
Nick Kralevich
f43499ce72 Merge "Introduce "adb keygen"" 2014-11-14 20:56:14 +00:00
Christopher Ferris
58661167ee am 514eefd5: am a46bf7eb: Merge "Convert futex to cond wait." 
* commit '514eefd53c94b3bab67a92bc7bd859a083a918d3':
  Convert futex to cond wait.
 2014-11-14 19:39:04 +00: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
Nick Kralevich
af782b9f2a 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
 2014-11-14 11:22:46 -08:00
Daniel Rosenberg
456fe3177b am 28d0d868: am 323df093: Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev 
* commit '28d0d868a4f69e3507a36960c80562f2b8c0ca3e':
  property_service: Added vendor build properties to load_all_props
 2014-11-14 19:18:23 +00:00
Andreas Gampe
c0791013d7 am de5fdd67: am 6ef68b55: Merge "System/core: Use memmove" 
* commit 'de5fdd67730def6d3002ae56b27bb349e2ad4d24':
  System/core: Use memmove
 2014-11-14 19:18:14 +00:00
Hans Boehm
818800e9a2 am 0b7f3684: am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" 
* commit '0b7f368442853f0eac86addd0f9cd186ac51262e':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."
 2014-11-14 19:18:00 +00:00
Sami Tolvanen
83231e2461 am 99184bab: (-s ours) am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata 
* commit '99184bab35c0b88dfc70c8be1d88cfb100dbf4cd':
  DO NOT MERGE: Do not mount devices with invalid verity metadata
 2014-11-14 19:17:33 +00:00
Sami Tolvanen
2511b65db6 am 2dfadac1: (-s ours) am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 
* commit '2dfadac1569126d72b2da42233afc908b7ec10a7':
  DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
 2014-11-14 19:17:32 +00:00
Chih-Hung Hsieh
002116c95d am 509f1c9a: am 165238d8: Merge "Fix a trivial typo." 
* commit '509f1c9aeee4fb2c5dd97bb4deeedcf8de0da900':
  Fix a trivial typo.
 2014-11-14 19:15:54 +00:00