Dario Freni
f0a8d6cd55
Merge "Add support for /product-services partition." into stage-aosp-master am: d99a836380 am: 351d1f3f93
...
am: 404bcf3ac7
Change-Id: I175dde7c8b4527cc538ce50e58f6969115812fba
2018-07-26 09:36:54 -07:00
Dario Freni
404bcf3ac7
Merge "Add support for /product-services partition." into stage-aosp-master am: d99a836380
...
am: 351d1f3f93
Change-Id: Iadd6368eb69f869ed72343d0d722311fe25161f6
2018-07-26 09:30:44 -07:00
Dario Freni
351d1f3f93
Merge "Add support for /product-services partition." into stage-aosp-master
...
am: d99a836380
Change-Id: I5ae4402936c8ae6b27d2330428150000275ea037
2018-07-26 09:24:43 -07:00
Dario Freni
d99a836380
Merge "Add support for /product-services partition." into stage-aosp-master
2018-07-26 16:16:38 +00:00
Tobias Thierer
ecda2ad9f1
Merge "Revert "libsparse: Add sparse typed callback"" am: 28fb130cbb am: 54f551f70c am: 8a7a4a0b50
...
am: 32058fa5ad
Change-Id: Ie229ac036f2c775ab8132f682217fef55876ac34
2018-07-26 04:16:50 -07:00
Tobias Thierer
32058fa5ad
Merge "Revert "libsparse: Add sparse typed callback"" am: 28fb130cbb am: 54f551f70c
...
am: 8a7a4a0b50
Change-Id: I259e8042cda17bebc7eb18a594c38945e795c26a
2018-07-26 03:54:38 -07:00
Tobias Thierer
8a7a4a0b50
Merge "Revert "libsparse: Add sparse typed callback"" am: 28fb130cbb
...
am: 54f551f70c
Change-Id: I5734e3ce0c6303040107c55506a280ac7e4b55be
2018-07-26 03:50:30 -07:00
Tobias Thierer
54f551f70c
Merge "Revert "libsparse: Add sparse typed callback""
...
am: 28fb130cbb
Change-Id: Iefd84b836fd418b9238522e42fd0d1e5da140f09
2018-07-26 03:45:23 -07:00
Tobias Thierer
28fb130cbb
Merge "Revert "libsparse: Add sparse typed callback""
2018-07-26 10:36:07 +00:00
Tobias Thierer
fca4a9c279
Revert "libsparse: Add sparse typed callback"
...
This reverts commit db69f0d47f .
Reason for revert: Broke the build:
In file included from system/core/libsparse/sparse.cpp:26:
system/core/libsparse/output_file.h:34:72: error: unknown type name 'off64_t'; did you mean 'off_t'?
int (*skip_write)(void*, off64_t), void* priv,
^~~~~~~
off_t
/Applications/Xcode6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/_types/_off_t.h:30:25: note: 'off_t' declared here
typedef __darwin_off_t off_t;
^
1 error generated.
Bug: 78793464
Change-Id: I0f8bc4e9aa2f74612bfd8721d00d961e3f7e695f
2018-07-26 05:23:45 +00:00
Tao Bao
299a77a45b
Merge "fs_mgr: Build and use shared libs." am: 9ff0669ac1 am: ff2886ae61 am: 26607959fc
...
am: 7e8e3843d1
Change-Id: I5be5da103396c9c85f8efffd0094399988ab5c8a
2018-07-25 22:10:12 -07:00
Tao Bao
7e8e3843d1
Merge "fs_mgr: Build and use shared libs." am: 9ff0669ac1 am: ff2886ae61
...
am: 26607959fc
Change-Id: I13a016fe98d87b32538a0a4a62090b9e99050e3a
2018-07-25 22:06:38 -07:00
Tao Bao
26607959fc
Merge "fs_mgr: Build and use shared libs." am: 9ff0669ac1
...
am: ff2886ae61
Change-Id: Iac4a73bf7555394848bcd963832b2c44fdb086d9
2018-07-25 22:02:45 -07:00
Tao Bao
ff2886ae61
Merge "fs_mgr: Build and use shared libs."
...
am: 9ff0669ac1
Change-Id: I4ee5e75801722174e9e9dac4edc833872cda45af
2018-07-25 21:58:34 -07:00
Tao Bao
9ff0669ac1
Merge "fs_mgr: Build and use shared libs."
2018-07-26 04:48:46 +00:00
Sandeep Patil
5a6bb4ba57
Merge changes Ica6bf5c6,I3f626433 am: 56f76ec018 am: 6d79d9f303 am: ca2e19a6c6
...
am: 9549b6d0bb
Change-Id: I0f3ce247554530d08881d68eee47de8f45a75d14
2018-07-25 19:49:32 -07:00
Sandeep Patil
9549b6d0bb
Merge changes Ica6bf5c6,I3f626433 am: 56f76ec018 am: 6d79d9f303
...
am: ca2e19a6c6
Change-Id: I62f16e74d8dd70b4624fd46024f6912fee486364
2018-07-25 19:45:19 -07:00
Sandeep Patil
ca2e19a6c6
Merge changes Ica6bf5c6,I3f626433 am: 56f76ec018
...
am: 6d79d9f303
Change-Id: I9be0e69cbacbd670d253a7d067cfe2600c347a45
2018-07-25 19:42:05 -07:00
Sandeep Patil
6d79d9f303
Merge changes Ica6bf5c6,I3f626433
...
am: 56f76ec018
Change-Id: I5f98902dafea961c892ace0145fbcf923b6838cb
2018-07-25 19:38:10 -07:00
Treehugger Robot
56f76ec018
Merge changes Ica6bf5c6,I3f626433
...
* changes:
fs_mgr: libdm: add support android-verity target.
dmctl: Do not skip argument if not matched with '-ro'.
2018-07-26 02:29:12 +00:00
Arve Hjønnevåg
c6c661a1b4
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test" am: 7b7e416649 am: c97372e73b am: 739081d0be
...
am: 139f03f7f0
Change-Id: Ie9833dc5fce3cb3e4afc41e401f4acef14a44cad
2018-07-25 17:40:47 -07:00
Arve Hjønnevåg
139f03f7f0
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test" am: 7b7e416649 am: c97372e73b
...
am: 739081d0be
Change-Id: Ic25952e92eeec9dfd2be1d756b2f1f3c2802e390
2018-07-25 17:32:38 -07:00
Elliott Hughes
fc58176f19
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS." am: e663c78d92 am: 5ae98112eb am: 91400ce720
...
am: 3025051735
Change-Id: I89950b9181de8dea1377dff8c65eced035c4f839
2018-07-25 17:29:11 -07:00
Arve Hjønnevåg
739081d0be
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test" am: 7b7e416649
...
am: c97372e73b
Change-Id: I2be9bf431ba08cf37454796607a8fcfc8b637b6d
2018-07-25 17:28:28 -07:00
Shawn Willden
840d106cdd
Merge "Add OWNERS file to gatekeeperd" am: c6b85a61e3 am: 8975fb338f am: 0f83b6bc82
...
am: 7a94fbd7e9
Change-Id: I075cc31605d16d051a1602f329b32cbe5066731a
2018-07-25 17:27:30 -07:00
Arve Hjønnevåg
c97372e73b
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"
...
am: 7b7e416649
Change-Id: I17c82528a7e373dd18137c7c976e868d4718bd5f
2018-07-25 17:24:18 -07:00
Arve Hjønnevåg
7b7e416649
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"
2018-07-26 00:17:54 +00:00
Elliott Hughes
3025051735
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS." am: e663c78d92 am: 5ae98112eb
...
am: 91400ce720
Change-Id: Ic0681ba5645f93e410aabdafd160b9784efc224a
2018-07-25 17:11:20 -07:00
Shawn Willden
7a94fbd7e9
Merge "Add OWNERS file to gatekeeperd" am: c6b85a61e3 am: 8975fb338f
...
am: 0f83b6bc82
Change-Id: If27923fb7876aaf5b411005b73580cfe131a90e7
2018-07-25 17:10:29 -07:00
Elliott Hughes
91400ce720
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS." am: e663c78d92
...
am: 5ae98112eb
Change-Id: I00ca2d7d715994aaabaee94a79215962c47031ec
2018-07-25 17:06:32 -07:00
Shawn Willden
0f83b6bc82
Merge "Add OWNERS file to gatekeeperd" am: c6b85a61e3
...
am: 8975fb338f
Change-Id: I083728aff6a0c5724c8d1750429a23fe7de203a3
2018-07-25 17:05:44 -07:00
Elliott Hughes
5ae98112eb
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS."
...
am: e663c78d92
Change-Id: I293f21462010e8098b226277636f04b4cd4b02a7
2018-07-25 16:59:03 -07:00
Shawn Willden
8975fb338f
Merge "Add OWNERS file to gatekeeperd"
...
am: c6b85a61e3
Change-Id: Ie869e93279f6a4fda26bb9393220282102229636
2018-07-25 16:56:56 -07:00
Chih-Hung Hsieh
da9f65cd9b
Merge "Declare __fake_use_va_args as a variadic function." am: e352a75b90 am: 7585d2270e am: bc7f7e7311
...
am: 044942e5b8
Change-Id: I72571e509dcda07ce4f2e36639523e23f5752146
2018-07-25 16:56:27 -07:00
Treehugger Robot
e663c78d92
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS."
2018-07-25 23:54:19 +00:00
Chih-Hung Hsieh
044942e5b8
Merge "Declare __fake_use_va_args as a variadic function." am: e352a75b90 am: 7585d2270e
...
am: bc7f7e7311
Change-Id: Icf03649f7f7862f5727b347020e1410af7e2d74e
2018-07-25 16:52:02 -07:00
Chih-Hung Hsieh
bc7f7e7311
Merge "Declare __fake_use_va_args as a variadic function." am: e352a75b90
...
am: 7585d2270e
Change-Id: I22f68c4b817769f88bccedbafac1b86e5fb6fcf9
2018-07-25 16:47:54 -07:00
Treehugger Robot
c6b85a61e3
Merge "Add OWNERS file to gatekeeperd"
2018-07-25 23:46:29 +00:00
Chih-Hung Hsieh
7585d2270e
Merge "Declare __fake_use_va_args as a variadic function."
...
am: e352a75b90
Change-Id: I4cfeb23cab215741944485baa47450115ed671e0
2018-07-25 16:44:45 -07:00
Treehugger Robot
e352a75b90
Merge "Declare __fake_use_va_args as a variadic function."
2018-07-25 23:34:18 +00:00
Shawn Willden
6cf9bdadee
Add OWNERS file to gatekeeperd
...
Test: Yes, that would be nice, wouldn't it?
Change-Id: I4116c2546bbc15ef5edb90867ed156637bb125c6
2018-07-25 15:02:38 -07:00
Elliott Hughes
e87aaf9831
trusty: add the trusty folks to the system/core/trusty/ OWNERS.
...
Bug: N/A
Test: N/A
Change-Id: Icd74a1fa322b4f7bd6a6a4d9e1b375b5598f84b6
2018-07-25 15:01:15 -07:00
Chih-Hung Hsieh
62b0ef556d
Declare __fake_use_va_args as a variadic function.
...
* New clang compiler requires variadic function to have
at least one named parameter type.
* Use ##__VA_ARGS__ to work with empty __VA_ARGS__.
* Fix one ALOG_ASSERT parameter bug in lmkd/lmkd.c.
Bug: 111614304
Test: make with WITH_TIDY=1
Change-Id: I90f35aa88527a6897954f69a35b256a157a725c5
2018-07-25 14:36:35 -07:00
Jerry Zhang
c65ff223d2
Merge "libsparse: Add sparse typed callback" am: 3edffdb794 am: 3014fd00ca am: 05d30fdad5
...
am: 364d4b9cf0
Change-Id: I3838eabeaea15b20f0a528bc0c7abcae3f28bef7
2018-07-25 14:08:43 -07:00
Tao Bao
a9fad6cd15
fs_mgr: Build and use shared libs.
...
Bug: 78793464
Test: `m dist`
Change-Id: I21ed5de72217c5cfa37e0217b0e79ed0a6f82031
2018-07-25 13:42:39 -07:00
Jerry Zhang
364d4b9cf0
Merge "libsparse: Add sparse typed callback" am: 3edffdb794 am: 3014fd00ca
...
am: 05d30fdad5
Change-Id: I2e95d6ffbf3da7d2f3a839c1743cc346eb213add
2018-07-25 13:24:46 -07:00
Jerry Zhang
05d30fdad5
Merge "libsparse: Add sparse typed callback" am: 3edffdb794
...
am: 3014fd00ca
Change-Id: I9ae7ebb8090681c1063ccb4a512d54616e4cf779
2018-07-25 13:21:37 -07:00
Jerry Zhang
3014fd00ca
Merge "libsparse: Add sparse typed callback"
...
am: 3edffdb794
Change-Id: I0fec7cbb940848ea7081f5524d5f43790693b4a6
2018-07-25 13:15:59 -07:00
Treehugger Robot
3edffdb794
Merge "libsparse: Add sparse typed callback"
2018-07-25 20:03:44 +00:00
Jerry Zhang
db69f0d47f
libsparse: Add sparse typed callback
...
Currently, sparse_file_callback uses libsparse's
own logic for reading a file into a buffer. However,
a caller may want to use their own logic for doing
this in order to customize the buffer size and parallelize
the reads/writes. Also, a caller may want to implement
fill blocks with their own logic as well. To do this
add sparse_file_typed_callback which calls a different
callback function depending on the type of the sparse
chunk being written.
Test: Use typed callback for fd writes
Bug: 78793464
Change-Id: I75955a464fc05991f806339830fdfa05fda354b9
2018-07-25 11:04:03 -07:00