Dmitriy Ivanov
1ee7e520e2
am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
...
* commit 'ec7cc9326e545f8ad32e03d2416e04850bdd454b':
Fix typo: ifndef -> ifneq
2014-08-26 00:25:20 +00:00
Dmitriy Ivanov
ec7cc9326e
Merge "Fix typo: ifndef -> ifneq"
2014-08-25 23:29:20 +00:00
Dmitriy Ivanov
85af05ae37
Fix typo: ifndef -> ifneq
...
Change-Id: Id71c70b6fcd2659078a19cc652fd02807372f3a0
2014-08-25 16:26:29 -07:00
Kenny Root
cf2b944df6
am 5a1d5a8c: Merge "ueventd: call _exit for safety"
...
* commit '5a1d5a8c79d0148291700cc5773a1519f2c6d8eb':
ueventd: call _exit for safety
2014-08-25 17:16:00 +00:00
Kenny Root
5a1d5a8c79
Merge "ueventd: call _exit for safety"
2014-08-25 17:05:37 +00:00
Kenny Root
17baff480a
ueventd: call _exit for safety
...
Make sure to call _exit instead of exit to avoid triggering exit
handlers that may have existed in the parent process.
Print out a log message when forking to process firmware events fails.
Change-Id: I2436bdf85d9a8ea26b718e62023f1dac89864667
2014-08-25 10:05:08 -07:00
Elliott Hughes
b48c46bcc2
am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
...
* commit '3cebf9f8c37262ba8c1ec8fcaa7083a6f8d82b77':
Add BSD false(1) and true(1).
2014-08-24 05:28:32 +00:00
Elliott Hughes
3cebf9f8c3
Merge "Add BSD false(1) and true(1)."
2014-08-24 02:54:32 +00:00
Elliott Hughes
50221f5837
Add BSD false(1) and true(1).
...
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
Calin Juravle
100386a9e7
am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
...
* commit 'e0677ccf998602e48d3c9777d22c401283464c46':
NativeBridge: Tighten security on libnativebridge
2014-08-22 11:37:12 +00:00
Calin Juravle
e0677ccf99
Merge "NativeBridge: Tighten security on libnativebridge"
2014-08-22 11:31:06 +00:00
Andreas Gampe
049249ce7a
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
(cherry picked from commit cd2ef4c1af )
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Elliott Hughes
4592d73e18
am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
...
* commit 'a59b6ac6973b3f5ce1246bf73969094779436892':
Only the Mac doesn't have open_memstream.
2014-08-21 02:58:30 +00:00
Elliott Hughes
a59b6ac697
Merge "Only the Mac doesn't have open_memstream."
2014-08-21 00:11:41 +00:00
Elliott Hughes
3ff8888f66
Only the Mac doesn't have open_memstream.
...
We should probably move this into art, since they're the only people using it.
Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes
f7e88e51b3
am 373c7758: Merge "There\'s no non-SMP LP64."
...
* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
There's no non-SMP LP64.
2014-08-20 20:22:23 +00:00
Elliott Hughes
373c77583f
Merge "There's no non-SMP LP64."
2014-08-20 12:21:52 +00:00
Elliott Hughes
901c900ce6
There's no non-SMP LP64.
...
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Dan Albert
5c16eb0772
am afc9bc01: Merge "Update for public android_set_abort_message()."
...
* commit 'afc9bc01b4f8a239b5f1a1c695b941a7d0ab8825':
Update for public android_set_abort_message().
2014-08-19 17:24:35 +00:00
Piotr Jastrzebski
6310d253ec
am 8fd1f27e: Merge "Reject zip archives with entry names containing \0."
...
* commit '8fd1f27ed866169684f44f24aeaa5c4722427d18':
Reject zip archives with entry names containing \0.
2014-08-19 15:54:23 +00:00
Piotr Jastrzebski
f36a2311ab
am 3e13ed08: Merge "Cleanup ziparchive"
...
* commit '3e13ed0864944c5fcff9d519eacf1f75c7db652a':
Cleanup ziparchive
2014-08-19 10:09:54 +00:00
Elliott Hughes
3859029a48
am 7fb0ee0c: Merge "Remove androidGetTid."
...
* commit '7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f':
Remove androidGetTid.
2014-08-18 19:24:33 +00:00
Piotr Jastrzebski
2528277424
am 5f231a43: Merge "Fix win_sdk build by not using vector"
...
* commit '5f231a43b342fcfbd778d14f953b0b63715ee7f2':
Fix win_sdk build by not using vector
2014-08-18 13:20:43 +00:00
Calin Juravle
583fab69ae
am 55494fb3: Merge "Switch libnativebridge to clang"
...
* commit '55494fb32da5d35b5e93266633b4b14f27011f71':
Switch libnativebridge to clang
2014-08-18 10:11:49 +00:00
Piotr Jastrzebski
f81da073da
am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
...
* commit 'c0879ee9d39ad4e9a2628c5cf1aaf4f843c13760':
Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:04:10 +00:00
Piotr Jastrzebski
8fd1f27ed8
Merge "Reject zip archives with entry names containing \0."
2014-08-16 05:59:09 +00:00
Piotr Jastrzebski
78271ba97b
Reject zip archives with entry names containing \0.
...
There should never be a need of an entry name with \0 character.
Bug: 16162465
Change-Id: Ia2ec57959280c1bb972c4d59d890c8540c5b9081
2014-08-19 11:02:58 +01:00
Piotr Jastrzebski
5f231a43b3
Merge "Fix win_sdk build by not using vector"
2014-08-16 04:55:08 +00:00
Piotr Jastrzebski
8e08536108
Fix win_sdk build by not using vector
...
Change-Id: I4e9ee4286ea29e1f5f2ee477525e79bfa16ad9a0
2014-08-18 14:04:56 +01:00
Piotr Jastrzebski
3e13ed0864
Merge "Cleanup ziparchive"
2014-08-16 04:31:31 +00:00
Piotr Jastrzebski
10aa9a0e24
Cleanup ziparchive
...
Addressed review comments from 8e08536108
Change-Id: If576e2d6cc5ad330a7dee66b09663e0c04ea3801
2014-08-19 10:58:03 +01:00
Calin Juravle
55494fb32d
Merge "Switch libnativebridge to clang"
2014-08-16 04:31:31 +00:00
Calin Juravle
db2127b662
Switch libnativebridge to clang
...
This fixes the mac build.
(cherry picked from commit 935708be6f )
Change-Id: I246a1c0af2124ed1cec653f2f44ca256f26534ff
2014-08-18 11:05:26 +01:00
Piotr Jastrzebski
c0879ee9d3
Merge "Replace char* with ZipEntryName in ziparchive API."
2014-08-16 04:31:31 +00:00
Colin Cross
f4a175b4d1
am 39ab11d0: Merge "fastboot: add the support of the second stage image"
...
* commit '39ab11d0d46b9be1bb41241ff58e3f6f3259dd74':
fastboot: add the support of the second stage image
2014-08-16 04:14:14 +00:00
Elliott Hughes
7fb0ee0c4d
Merge "Remove androidGetTid."
2014-08-16 04:08:14 +00:00
Elliott Hughes
b7659613b2
Remove androidGetTid.
...
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Colin Cross
39ab11d0d4
Merge "fastboot: add the support of the second stage image"
2014-08-16 04:08:14 +00:00
Dan Albert
afc9bc01b4
Merge "Update for public android_set_abort_message()."
2014-08-16 04:03:35 +00:00
Dan Albert
4047075da6
Update for public android_set_abort_message().
...
Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.
Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
2014-08-18 17:29:34 -07:00
Piotr Jastrzebski
ecccc5ad93
Replace char* with ZipEntryName in ziparchive API.
...
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.
Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle
5ed25acd4a
am 25a7d5f8: Merge "Move native bridge library in system/core"
...
* commit '25a7d5f892f2606ed28eff761c59693398497343':
Move native bridge library in system/core
2014-08-15 11:39:22 +00:00
Calin Juravle
25a7d5f892
Merge "Move native bridge library in system/core"
2014-08-15 04:45:59 +00:00
Ying Wang
87ad7cdc59
am e1ba39aa: Merge "Fix 64-bit host build."
...
* commit 'e1ba39aa6644feb9c5f742f65db6d3363203951f':
Fix 64-bit host build.
2014-08-14 23:16:46 +00:00
Piotr Jastrzebski
fa41212789
am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
...
* commit 'b242ad40b1e0d3984e469e3d35876a4859f4952b':
Revert "Make sure that names of all entries have the same encoding."
2014-08-13 09:58:33 +00:00
Piotr Jastrzebski
b720c8d601
am b0206765: Merge "Make sure that names of all entries have the same encoding."
...
* commit 'b020676566f38380f4303eaa7d196d6fef019dd9':
Make sure that names of all entries have the same encoding.
2014-08-13 09:03:11 +00:00
Calin Juravle
961ae12dea
Move native bridge library in system/core
...
Bug: 16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Badhri Jagan Sridharan
0d8943c252
am e4c5b614: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
...
* commit 'e4c5b6143b12925426a1af36ae0a201d18f93cad':
libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 20:59:20 +00:00
Piotr Jastrzebski
b242ad40b1
Merge "Revert "Make sure that names of all entries have the same encoding.""
2014-08-12 20:07:20 +00:00
Piotr Jastrzebski
bd0a74854e
Revert "Make sure that names of all entries have the same encoding."
...
This reverts commit 6a7f4bb79d .
Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00