ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
42259 commits 1 branch 0 tags 217 MiB
Commit graph

42259 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Tobias Thierer
949ec4ee93 Merge "Revert "Add derived UsbTransport class with USB reset method"" am: f6ee8fe515 
am: c526c79b37

Change-Id: Ibea10b2a8b01a9322f4a1cc3cd6fb43ed7d92d5d
 2018-07-25 08:40:32 -07:00
Tobias Thierer
c526c79b37 Merge "Revert "Add derived UsbTransport class with USB reset method"" 
am: f6ee8fe515

Change-Id: Ia50999004b5505566051e3927daa646a2024687b
 2018-07-25 08:34:14 -07:00
Tobias Thierer
f6ee8fe515 Merge "Revert "Add derived UsbTransport class with USB reset method"" 2018-07-25 15:24:54 +00:00
Tobias Thierer
ec1542f22d Revert "Add derived UsbTransport class with USB reset method" 
This reverts commit ceb7cbf5fd.

Reason for revert: Broke mac builds:
system/core/fastboot/usb_osx.cpp:513:35: error: use of undeclared identifier 'USB_TRANSACTION_TIMEOUT'
USB_TRANSACTION_TIMEOUT, USB_TRANSACTION_TIMEOUT);
^

Change-Id: Ibe2f9ff2d5c63f9d33f4bd6d9ba962604cf8caeb
 2018-07-25 10:41:24 +00:00
Yi Kong
2376c39336 Merge "[libsysutils] Modernize codebase by replacing NULL with nullptr" am: 1c92fa4480 
am: e21533137e

Change-Id: I93981541001ad66cdb49cd209021c0a74b7ad31c
 2018-07-24 19:08:57 -07:00
Yi Kong
e21533137e Merge "[libsysutils] Modernize codebase by replacing NULL with nullptr" 
am: 1c92fa4480

Change-Id: Ibeda0198208fd195028668270377a6d75154ce4e
 2018-07-24 19:04:47 -07:00
Treehugger Robot
1c92fa4480 Merge "[libsysutils] Modernize codebase by replacing NULL with nullptr" 2018-07-25 01:52:28 +00:00
Tom Cherry
b5c52dc95e Merge "init: fix typo in error message" am: 2efcb522df 
am: 4d71e6fb45

Change-Id: I2435bb7857cc1817cd5890197ab4943a03f91aa9
 2018-07-24 17:59:02 -07:00
Tom Cherry
4d71e6fb45 Merge "init: fix typo in error message" 
am: 2efcb522df

Change-Id: I36cc5ebced34cbd288123a71081997c909361890
 2018-07-24 17:55:51 -07:00
Treehugger Robot
2efcb522df Merge "init: fix typo in error message" 2018-07-25 00:43:30 +00:00
Yabin Cui
b8ca49d2f6 Merge "libprocinfo: return error msg instead of printing it." am: 220c1d5589 
am: a9fa007c2e

Change-Id: Icdbdeb22d028a35de600b4340b39b3111383b517
 2018-07-24 16:39:02 -07:00
Yabin Cui
a9fa007c2e Merge "libprocinfo: return error msg instead of printing it." 
am: 220c1d5589

Change-Id: I4e697bf6370cb95bed686dd2c769891fc6bceabd
 2018-07-24 16:35:21 -07:00
Yi Kong
4888525c55 [libsysutils] Modernize codebase by replacing NULL with nullptr 
Fixes -Wzero-as-null-pointer-constant warning.

Test: m
Bug: 68236239
Change-Id: I9e95daa0750f2622d1c4788941fdfae23ee61801
 2018-07-24 16:34:27 -07:00
Tom Cherry
427cf922ad Merge "Add recovery_available: true to init dependencies" am: 24f226df87 
am: 5c5e24c1b6

Change-Id: I097b7841fcfb8b64bad6df5bcebb6ccb91e195a5
 2018-07-24 16:31:00 -07:00
Yabin Cui
220c1d5589 Merge "libprocinfo: return error msg instead of printing it." 2018-07-24 23:28:01 +00:00
Tom Cherry
5c5e24c1b6 Merge "Add recovery_available: true to init dependencies" 
am: 24f226df87

Change-Id: Ie66aeb501eaa63b92cede2344004e05d2745bb55
 2018-07-24 16:26:50 -07:00
Treehugger Robot
24f226df87 Merge "Add recovery_available: true to init dependencies" 2018-07-24 23:16:05 +00:00
Tom Cherry
8c901dda30 init: fix typo in error message 
Test: none
Change-Id: Ie8417c7c6e3f6600544006c4a84b5bdfaff9725f
 2018-07-24 15:54:33 -07:00