Andrew Scull
b6d65c1e65
Merge "Add HSM AID." am: 4723d7c66d am: ef1dd0d279 am: a3f425950c
...
am: e05c35a10b
Change-Id: I7771055351d614804d48baee0eaad769c917ae82
2017-08-10 21:56:42 +00:00
Andrew Scull
e05c35a10b
Merge "Add HSM AID." am: 4723d7c66d am: ef1dd0d279
...
am: a3f425950c
Change-Id: Iabda5247da9a91648772165eb24b5df5bf7e553d
2017-08-10 21:43:47 +00:00
Andrew Scull
a3f425950c
Merge "Add HSM AID." am: 4723d7c66d
...
am: ef1dd0d279
Change-Id: I3b00e1fd0761e9d9daa439cf1ca5eedc0eab84fb
2017-08-10 21:39:47 +00:00
Andrew Scull
ef1dd0d279
Merge "Add HSM AID."
...
am: 4723d7c66d
Change-Id: If7075378ac5a13bbe79a02843d13d34c5f128d2a
2017-08-10 21:35:47 +00:00
Andrew Scull
f73c5e1f84
Add HSM AID.
...
This is used by resources related to a hardware security module (HSM).
Bug: 64569509
Change-Id: I30d47e1b275e3c4ae0a00f7ceb286a1096d84273
2017-08-10 20:25:11 +01:00
Robert Quattlebaum
83e97d28b8
Merge "Add AID for LoWPAN subsystem" am: f602dd4ced am: 4ff32084d5 am: 91f952dda0
...
am: 228123a5c8
Change-Id: I77fc332439db1b405065bb6b10b562152b889efb
2017-08-08 00:04:20 +00:00
Robert Quattlebaum
228123a5c8
Merge "Add AID for LoWPAN subsystem" am: f602dd4ced am: 4ff32084d5
...
am: 91f952dda0
Change-Id: I49a6c9c9db980910a0d2d9289ca1a123f21f3eed
2017-08-08 00:00:55 +00:00
Robert Quattlebaum
91f952dda0
Merge "Add AID for LoWPAN subsystem" am: f602dd4ced
...
am: 4ff32084d5
Change-Id: Ib4ff4c6eee71e1bf189e5cb945405cd679d77112
2017-08-07 23:56:49 +00:00
Robert Quattlebaum
4ff32084d5
Merge "Add AID for LoWPAN subsystem"
...
am: f602dd4ced
Change-Id: Idd091e64fd9cab58f38da67e0b32e0aa9c98fb7d
2017-08-07 23:55:19 +00:00
Robert Quattlebaum
01f7576a3e
Add AID for LoWPAN subsystem
...
Bug: b/64399805
Change-Id: Ida6aa60d8beee9151a723826d99c1e9044dc05be
2017-08-04 16:19:34 -07:00
Earl Ou
a11a0a6661
Merge "libcutils: write trace event into socket in container" am: 59b33cb01c am: 08d9cc3744 am: 6cc4df26d6
...
am: 9435b3ed44
Change-Id: Ie16cca591dd2a45e97b4ec77554f311c070e2499
2017-08-04 01:21:42 +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
Yifan Hong
70b8a597f0
Merge changes from topic 'libcutils_private_headers' am: 472808a570 am: 6c2d927c34 am: 2615527f08
...
am: 8a05dd0472
Change-Id: I8a4c7809e61670da27f67f9301243a7acf9dc7ce
2017-08-03 20:59:04 +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
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
Yifan Hong
6c2d927c34
Merge changes from topic 'libcutils_private_headers'
...
am: 472808a570
Change-Id: Ia4963b1b2c50bdcc3d9ccc6a954a465cbf9b5de0
2017-08-03 20:34:31 +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
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
7f59fe0a53
Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5 am: f5a677a7d3 am: 2bf647ae24
...
am: c3bc295f11
Change-Id: Icac1607008336c8170dfcb9b161b80ea97fc7e51
2017-08-03 02:38:04 +00: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
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
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
Treehugger Robot
5c655991f5
Merge "cutils: update property_get to use diagnose_if."
2017-08-03 02:15:54 +00:00
Justin Yun
a9823defe7
Merge "Mark the modules as VNDK-SP in Android.bp" into oc-mr1-dev
...
am: 58f38017f7
Change-Id: I0f623e5cbc60e7fc5123679123ce821fac004158
2017-08-03 01:08:34 +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
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
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
Elliott Hughes
84cd98ceb0
Merge "Make sure freeaddrinfo is always called on failure." am: f914029057
...
am: 9e1173aa40
Change-Id: Ib7936a9034467c38a58b5066472cdd5187a0e1b2
2017-08-02 23:22:36 +00:00
Elliott Hughes
9e1173aa40
Merge "Make sure freeaddrinfo is always called on failure."
...
am: f914029057
Change-Id: Iff3b186c35bca1f1c7292f5e5567d3ce11037239
2017-08-02 23:10:59 +00:00
George Burgess IV
9bf11c1d05
cutils: update property_get to use diagnose_if.
...
This lets us redeclare property_get with diagnose_if tagged on it,
so we no longer need to deal with overloads.
Bug: 12231437
Test: m checkbuild on bullhead aosp-master.
Change-Id: Ic55dcfeaa314f83d3713aabac7852cb766330fc8
2017-08-02 15:59:19 -07:00
Elliott Hughes
3ff453aaa0
Make sure freeaddrinfo is always called on failure.
...
Bug: https://android-review.googlesource.com/#/c/platform/system/core/+/268797/2/libcutils/socket_network_client_unix.c
Test: builds
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Change-Id: I2d93c8359c3398769d408284f77d56e09713a7f3
2017-08-02 20:32:27 +00:00
Chih-Hung Hsieh
c3357de3fd
Merge "Fix misc-macro-parentheses warnings in system/core." am: e4bd153e55 am: dfaa20c069
...
am: 3d0ff4ee98
Change-Id: Id161056885d346583e66ca49bf10934bc01e619f
2017-08-01 23:34:26 +00:00
Chih-Hung Hsieh
3d0ff4ee98
Merge "Fix misc-macro-parentheses warnings in system/core." am: e4bd153e55
...
am: dfaa20c069
Change-Id: I2a2376e19bdd415f784f708e2b8c910734e866a9
2017-08-01 23:29:59 +00:00
Chih-Hung Hsieh
dfaa20c069
Merge "Fix misc-macro-parentheses warnings in system/core."
...
am: e4bd153e55
Change-Id: I6b38149a0fa15874eff68cbf7ee62e4acd41c595
2017-08-01 23:26:06 +00:00
Chih-Hung Hsieh
85244e8bc2
Fix misc-macro-parentheses warnings in system/core.
...
Add NOLINT comment to work around clang-tidy
error in checking macro arguments used in
type expressions.
Bug: 28705665
Test: make with WITH_TIDY=1 WITH_TIDY_CHECKS=-*,misc-macro-* \
WITH_TIDY_FLAGS=-header-filter=system/core/.*
Change-Id: I7619978c1804e151a11a8b0477e80076bcf21cab
2017-08-01 22:12:57 +00:00
Justin Yun
aeb68e86e4
Mark the modules as VNDK-SP in Android.bp
...
As a VNDK-SP module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.
The 'vndk' tag for VNDK-SP formated as follows:
vndk: {
enabled: true,
support_system_process: true,
},
VNDK-SP modules will be installed both in system/lib(64) as normal
and in system/lib(64)/vndk-sp as a vendor variant.
Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I51fe0859f63ad58b7b91909e7d7d4206443228cd
2017-07-31 23:37:32 +00:00
Lennart Wieboldt
e1332dd01b
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985
...
am: 8a8b97b271
Change-Id: I7e691abe2e2ccec5d9477c528d603c081c0a5661
2017-07-25 22:35:56 +00:00
Lennart Wieboldt
8a8b97b271
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b
...
am: f7b315c985
Change-Id: Id5ebeb3271a36f21bf28c186f7ec227d31bb10ac
2017-07-25 22:33:27 +00:00
Lennart Wieboldt
f7b315c985
Merge "Remove LOCAL_CLANG and clang: true"
...
am: 80ec81cf4b
Change-Id: Ia7f79d8e25ee9870fe44d198568d0e5dabdff811
2017-07-25 22:28:56 +00:00
Lennart Wieboldt
cd15fc7ba8
Remove LOCAL_CLANG and clang: true
...
clang is the default compiler since Android nougat
Test: mma & verified it´s still build with clang
Change-Id: I34adaeef2f6558a09f26027271222bad94780507
Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
2017-07-25 14:29:50 +02:00
Elliott Hughes
f4b01412f1
Merge "Remove more documentation for obsolete board configuration." am: 73a6512bab am: 09181f3dd9
...
am: 94d5235c25
Change-Id: I128a89de4783b152f4129d0c5f16e766ed349ea2
2017-06-30 00:07:45 +00:00
Elliott Hughes
94d5235c25
Merge "Remove more documentation for obsolete board configuration." am: 73a6512bab
...
am: 09181f3dd9
Change-Id: I95e37353d84e69df12a2b5ef36b02b771cbbf0eb
2017-06-30 00:03:45 +00:00
Elliott Hughes
09181f3dd9
Merge "Remove more documentation for obsolete board configuration."
...
am: 73a6512bab
Change-Id: I964c133a654efbc3d40bbebc7247863455e8cb54
2017-06-29 23:59:43 +00:00
Elliott Hughes
73a6512bab
Merge "Remove more documentation for obsolete board configuration."
2017-06-29 23:50:37 +00:00
Elliott Hughes
5dc7736f60
Remove more documentation for obsolete board configuration.
...
Bug: N/A
Test: builds
Change-Id: I0a4ea974a81aadba1a554072ceff9f243a70be0d
2017-06-29 08:52:49 -07:00
Jiyong Park
dfed7fb8ca
Merge "Allow SLOG* to vendors" am: 6afbd476ab am: eacf704a6c
...
am: 708f8295e0
Change-Id: I8895882d557e162388fcc672375f721849b83fc2
2017-06-29 04:07:28 +00:00
Jiyong Park
708f8295e0
Merge "Allow SLOG* to vendors" am: 6afbd476ab
...
am: eacf704a6c
Change-Id: I234763f63446115ce8726c1c0a0c931b25bcee0b
2017-06-29 04:03:29 +00:00