Tom Cherry
bb0c02c06e
Merge "init: more unique_fd, less goto" am: 401c9cb330 am: 0908ca721a
...
am: 613fd13dc2
Change-Id: I83c87dd1f06b1a4246981e2b4d9eaf9a275569eb
2017-08-04 20:38:58 +00:00
Tom Cherry
613fd13dc2
Merge "init: more unique_fd, less goto" am: 401c9cb330
...
am: 0908ca721a
Change-Id: Iab85433cbe327daf6854444dc235adf31acd0925
2017-08-04 20:32:56 +00:00
Tom Cherry
0908ca721a
Merge "init: more unique_fd, less goto"
...
am: 401c9cb330
Change-Id: If621924a00686b41889d4e75ad360c3c3d3d4a85
2017-08-04 20:26:57 +00:00
Tom Cherry
401c9cb330
Merge "init: more unique_fd, less goto"
2017-08-04 20:13:10 +00:00
Tom Cherry
7c4609cfb3
init: more unique_fd, less goto
...
Test: boot bullhead
Change-Id: I3c31ca045538d9c9dbbf9c8f27f63033344627fd
2017-08-04 20:12:56 +00:00
Jin Qian
410b39886f
fastboot: add mke2fs and e2fsdroid to build package
...
am: c2ca105575
Change-Id: I19c6ae343d962aa3b6c87851c4b890dbb67b0c91
2017-08-04 16:18:42 +00:00
Jin Qian
5d487c5ee4
fastboot: call mke2fs to format ext4 filesystem on windows
...
am: 92064ef073
Change-Id: I4cb2952a645f80842ff4aaccc3960608a743e3d3
2017-08-04 16:18:25 +00:00
Jin Qian
abc99e2ccf
fastboot: call mke2fs tools to generate ext4 image
...
am: ffef31cef1 -s ours
Change-Id: I3dca7579c09d7bc0aceb85fdcf70ec531a70ae27
2017-08-04 16:18:06 +00:00
Earl Ou
9435b3ed44
Merge "libcutils: write trace event into socket in container" am: 59b33cb01c am: 08d9cc3744
...
am: 6cc4df26d6
Change-Id: Ib4a23ef6f3644afe76e6615bdc1be0e4fd7f909c
2017-08-04 01:16:12 +00:00
Earl Ou
6cc4df26d6
Merge "libcutils: write trace event into socket in container" am: 59b33cb01c
...
am: 08d9cc3744
Change-Id: Ie6f05ca73b0391f6b739e43cf0920d5c52c0d882
2017-08-04 01:10:12 +00:00
Earl Ou
08d9cc3744
Merge "libcutils: write trace event into socket in container"
...
am: 59b33cb01c
Change-Id: Ie59769f5820a8bb5991ba3dca53df83c5e90f795
2017-08-04 01:04:15 +00:00
Treehugger Robot
59b33cb01c
Merge "libcutils: write trace event into socket in container"
2017-08-04 00:50:59 +00:00
Jocelyn Bohr
67d5ddde7b
Merge "Return correct error code when finish input length is too long." am: 90657bbeab am: efea269a75
...
am: 18e3e2a66f
Change-Id: I40d235ba41cdb8a94d2955ed4dc77d94df72ed7b
2017-08-03 23:55:11 +00:00
Jocelyn Bohr
18e3e2a66f
Merge "Return correct error code when finish input length is too long." am: 90657bbeab
...
am: efea269a75
Change-Id: Ida8d5c1742b6913b1f3b744c303e8abc3280b718
2017-08-03 23:51:11 +00:00
Jocelyn Bohr
efea269a75
Merge "Return correct error code when finish input length is too long."
...
am: 90657bbeab
Change-Id: I96ea16c713efcc51533b9aafab3624b0070b3dc3
2017-08-03 23:44:35 +00:00
Treehugger Robot
90657bbeab
Merge "Return correct error code when finish input length is too long."
2017-08-03 23:35:05 +00:00
Jin Qian
c2ca105575
fastboot: add mke2fs and e2fsdroid to build package
...
Bug: 23686092
Bug: 63849632
Change-Id: Iff0d92b7174597d43ee646847888aedc2080052a
(cherry picked from commit 6ce78321a2 )
2017-08-03 14:50:17 -07:00
Jin Qian
92064ef073
fastboot: call mke2fs to format ext4 filesystem on windows
...
Bug: 35219933
Change-Id: I0cc8c165176e8dc9cbe4b6a52679937bc872e2d0
(cherry picked from commit 29fc859a6d )
2017-08-03 14:40:43 -07:00
Jin Qian
ffef31cef1
fastboot: call mke2fs tools to generate ext4 image
...
Set MKE2FS_CONFIG to empty to use mke2fs default configs
Test: fastboot --wipe-and-use-fbe
Bug: 35219933
Change-Id: Ibc97bb125899e1f1fe820d53709fdb2ab291c171
(cherry picked from commit d14d7c14cb )
2017-08-03 14:39:12 -07:00
Jocelyn Bohr
f1e5edf765
Return correct error code when finish input length is too long.
...
Bug: 63745895
Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70
2017-08-03 13:59:10 -07:00
Christopher Ferris
7584fafc44
Merge "Add support for the new unwind method." am: 172b1d0008 am: 0d35dffc18
...
am: 88636a05ad
Change-Id: Idabc050663067baedd84578d24a057775b97af9d
2017-08-03 20:48:45 +00:00
Yifan Hong
8a05dd0472
Merge changes from topic 'libcutils_private_headers' am: 472808a570 am: 6c2d927c34
...
am: 2615527f08
Change-Id: I433589f4691d74f8fcd2a30ad34ab817e9b6a36d
2017-08-03 20:47:53 +00:00
Christopher Ferris
88636a05ad
Merge "Add support for the new unwind method." am: 172b1d0008
...
am: 0d35dffc18
Change-Id: Ib6285bf8fa8cccba5200d0af9bfb4940a102f254
2017-08-03 20:41:59 +00:00
Yifan Hong
2615527f08
Merge changes from topic 'libcutils_private_headers' am: 472808a570
...
am: 6c2d927c34
Change-Id: I0718ab31e074b716f9be50a25330ffa8bdaae47d
2017-08-03 20:41:40 +00:00
Christopher Ferris
0d35dffc18
Merge "Add support for the new unwind method."
...
am: 172b1d0008
Change-Id: Ia42e055e36053f8618dc0e2c13c2cc84bc1a148d
2017-08-03 20:34:51 +00:00
Yifan Hong
6c2d927c34
Merge changes from topic 'libcutils_private_headers'
...
am: 472808a570
Change-Id: Ia4963b1b2c50bdcc3d9ccc6a954a465cbf9b5de0
2017-08-03 20:34:31 +00:00
Christopher Ferris
172b1d0008
Merge "Add support for the new unwind method."
2017-08-03 19:08:34 +00:00
Yifan Hong
472808a570
Merge changes from topic 'libcutils_private_headers'
...
* changes:
Remove private headers from libcutils.vendor
Move android_filesystem_config.h => fs_config.h
2017-08-03 18:24:04 +00:00
Christopher Ferris
6f3981c181
Add support for the new unwind method.
...
Also add a comment to the GetElf function to indicate that it never returns
nullptr.
Also needed to add this library to the a million and one places that the vndk
has hard-coded this data.
Bug: 23762183
Test: Built, nothing uses the new code.
Test: However, I did run backtrace_test using this code, and all tests pass.
Change-Id: Ib270665dcb7a7607075e36d88be76dbde6e2faa8
(cherry picked from commit dc4104b720 )
2017-08-03 10:15:44 -07:00
Earl Ou
e4030384c4
libcutils: write trace event into socket in container
...
When Android is running in a container, ftrace trace_marker may be
disabled, e.g. Chrome OS verified mode. To enable trace, a socket is
created for everyone to send trace event.
Modify libcutils so apps using it can write trace to the socket.
To achieve this goal without touching code for normal device,
trace-container.c is created for code specific to container. Shared
code between trace-dev.c and trace-container.c is moved to local
trace-dev.h.
Note that to avoid sharing FDs across different processes, Zygote closes
FD and reopen it to /dev/null if it is a socket. Therefore, we need to
manually close FD and reopen it again after forking. This is done in
the atrace_set_tracing_enabled as Zygote also use it to clear flags
during forking.
Related change:
- http://crrev.com/2400163003 (Chromium)
- http://ag/2028075 (Android system/core)
- http://ag/1738271 (Android device/google/cheets2)
Bug: 29776474, 62410809
Test: run chrome://tracing and see data from the host side.
Change-Id: I3fe969e284b972c28e4f32f23cd948aaea61a043
2017-08-03 15:16:44 +08:00
George Burgess IV
c3bc295f11
Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5 am: f5a677a7d3
...
am: 2bf647ae24
Change-Id: Ib4561d402548195772757b83dc0638c28682dd5a
2017-08-03 02:33:22 +00:00
Elliott Hughes
cb6e5d6ed2
Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b
...
am: 514464f4ca
Change-Id: Ibbd6515b4a44105e7b965e7b36bc4c3648c7e713
2017-08-03 02:33:04 +00:00
George Burgess IV
2bf647ae24
Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5
...
am: f5a677a7d3
Change-Id: I39671d3f090f605d2f9ba3636c342ab5ee46c6bc
2017-08-03 02:28:23 +00:00
Elliott Hughes
514464f4ca
Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21
...
am: 0915192d8b
Change-Id: I4e41e4f243d68f73b67dc066d5b780ef5926b749
2017-08-03 02:28:04 +00:00
George Burgess IV
f5a677a7d3
Merge "cutils: update property_get to use diagnose_if."
...
am: 5c655991f5
Change-Id: I7dff3fb2ff288800d72d9c632617639fa7e6bf9e
2017-08-03 02:23:30 +00:00
Elliott Hughes
0915192d8b
Merge "Stop asking for old versions of C++ in system/core."
...
am: e61e2fcf21
Change-Id: I9c424e8bb99c7f03baefc794e4b095b8d29db3bb
2017-08-03 02:23:09 +00:00
Treehugger Robot
5c655991f5
Merge "cutils: update property_get to use diagnose_if."
2017-08-03 02:15:54 +00:00
Treehugger Robot
e61e2fcf21
Merge "Stop asking for old versions of C++ in system/core."
2017-08-03 02:14:45 +00:00
Elliott Hughes
df5ecefde4
Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f am: 15d565bbca
...
am: b664dd38b9
Change-Id: Id2d91a34d11400cdb4b601da745d64209aeb3e71
2017-08-03 00:25:00 +00:00
Elliott Hughes
b664dd38b9
Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f
...
am: 15d565bbca
Change-Id: Ibb3694aa20648a1313b8e9de9a2f56628b863365
2017-08-03 00:19:33 +00:00
Elliott Hughes
15d565bbca
Merge "Fix reference to out of scope local in adb_thread_setname."
...
am: b31ca1a64f
Change-Id: Idc5b3208b7868a2636b7c335c48db57dd48e8b83
2017-08-03 00:15:37 +00:00
Josh Gao
fb3d04b440
Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d6b am: 9560524455
...
am: 9e4fb9a117
Change-Id: Id5e5cee1294ae947bc2b9d1ce8d210c595b068cd
2017-08-03 00:09:50 +00:00
Josh Gao
9e4fb9a117
Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d6b
...
am: 9560524455
Change-Id: I37dc94c066c1527c10488e48c713c29b4e211cfb
2017-08-02 23:59:32 +00:00
Treehugger Robot
b31ca1a64f
Merge "Fix reference to out of scope local in adb_thread_setname."
2017-08-02 23:57:57 +00:00
Yifan Hong
b6807125df
Remove private headers from libcutils.vendor
...
Bug: 63135587
Test: m -j
Test: BOARD_VNDK_VERSION=current m -j
Test: mma -j
Test: BOARD_VNDK_VERSION=current mma -j
Change-Id: I9eecf23c4c311bd8336a5bfaaeb2afb3b51c6513
Merged-In: I9eecf23c4c311bd8336a5bfaaeb2afb3b51c6513
2017-08-02 16:40:36 -07:00
Josh Gao
9560524455
Merge "Revert "base: work around thread safety analysis bug.""
...
am: b5c90e9d6b
Change-Id: Ieda68e652c9784990dd7d03c4101b5a9ed18d98a
2017-08-02 23:32:58 +00:00
Yifan Hong
09c89672b6
Move android_filesystem_config.h => fs_config.h
...
The non AID_ things in android_filesystem_config.h are moved
to fs_config.h. For libcutils.vendor and libcutils_headers.vendor,
fs_config.h is not exported.
An empty system/core/include/private/fs_config.h is placed to
appease the dependency from certain modules (logd, etc.)
that includes system/core/include/private/android_filesystem_config.h
directly.
Test: m -j
Test: BOARD_VNDK_VERSION=current m -j
Bug: 63135587
Change-Id: I95dfb874a426941022b100c0ca26a0576b0f4aa3
Merged-In: I95dfb874a426941022b100c0ca26a0576b0f4aa3
2017-08-02 16:31:19 -07:00
Josh Gao
6db08e9e1f
Merge "base: work around thread safety analysis bug." am: f3c7f10abd am: f727a3933e
...
am: 14c7e22a50
Change-Id: I8f9c6e581ad967280dd44cabdd0aa31866e1ace9
2017-08-02 23:30:27 +00:00
Elliott Hughes
78bc132d32
Merge "Make sure freeaddrinfo is always called on failure." am: f914029057 am: 9e1173aa40
...
am: 84cd98ceb0
Change-Id: I3d36bf694b20cf423cf1b3b5f647f7e907f20703
2017-08-02 23:28:54 +00:00
George Burgess IV
060bb6038b
Merge "libappfuse: use an explicit buffer size" am: ac8a484646 am: 7aa81fcdad
...
am: 864008e980
Change-Id: I72ee9e23ff25ca2d973bc18be0f4a256e80e2126
2017-08-02 23:27:56 +00:00