Yabin Cui
29e142760d
am 26d2b64b: am 81906d4b: Merge "kill HAVE_MADVISE"
...
* commit '26d2b64ba84e926e46e8d41214c75461dfeeda78':
kill HAVE_MADVISE
2014-11-19 04:40:09 +00:00
Yabin Cui
26d2b64ba8
am 81906d4b: Merge "kill HAVE_MADVISE"
...
* commit '81906d4b0c508dc308606ca232eaa055255abd1e':
kill HAVE_MADVISE
2014-11-19 04:35:27 +00:00
Yabin Cui
81906d4b0c
Merge "kill HAVE_MADVISE"
2014-11-19 04:25:59 +00:00
Yabin Cui
745c5f6ad0
kill HAVE_MADVISE
...
Change to avoid "unused parameter" warning.
Bug: 18397020
Change-Id: I4b26de55314c78237daead8e873385b97cafe4d4
2014-11-19 04:03:27 +00:00
Yabin Cui
8a902ae9ff
am ad450e63: am c8ad1809: Merge "kill HAVE_MADVISE"
...
* commit 'ad450e6361b13ebaa57bfa7f846159f2dbdbb710':
kill HAVE_MADVISE
2014-11-19 03:35:22 +00:00
Yabin Cui
ad450e6361
am c8ad1809: Merge "kill HAVE_MADVISE"
...
* commit 'c8ad180983fb50c89179b7895896ad1f35cb885a':
kill HAVE_MADVISE
2014-11-19 03:30:45 +00:00
Yabin Cui
c8ad180983
Merge "kill HAVE_MADVISE"
2014-11-19 03:17:46 +00:00
Yabin Cui
819b480b93
kill HAVE_MADVISE
...
Bug: 18397020
Change-Id: Ibc8d886d729c51932a403531888214de4e541452
2014-11-18 18:15:40 -08:00
Elliott Hughes
cc1be8520f
am eda507e4: am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
...
* commit 'eda507e4921bf6f027d88433fc4e15f4b860046d':
Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:29:14 +00:00
Elliott Hughes
eda507e492
am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
...
* commit '0655d38b0c998f294ad52f1f8e84233a48046e97':
Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:23:58 +00:00
Elliott Hughes
0655d38b0c
Merge "Revert "adb: Add USB vendor ID for Honeywell""
2014-11-18 21:15:44 +00:00
Elliott Hughes
3e01bb85d6
Revert "adb: Add USB vendor ID for Honeywell"
...
This reverts commit 8c4c8e8988 .
Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
2014-11-18 21:15:28 +00:00
Elliott Hughes
c1ebb22cbd
am 450c4ad0: am 16068830: Merge "toolbox: enable mkswap to work on block devices"
...
* commit '450c4ad097673111965d9143dbc6671778c0b00c':
toolbox: enable mkswap to work on block devices
2014-11-18 20:22:39 +00:00
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
450c4ad097
am 16068830: Merge "toolbox: enable mkswap to work on block devices"
...
* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
toolbox: enable mkswap to work on block devices
2014-11-18 19:19:49 +00:00
Elliott Hughes
1606883044
Merge "toolbox: enable mkswap to work on block devices"
2014-11-18 19:11:56 +00:00
Andrew Boie
d90615cefd
toolbox: enable mkswap to work on block devices
...
Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-11-18 10:42:14 -08: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