Commit Graph

29559 Commits

Author SHA1 Message Date
Josh Gao e80f6668f5 Merge "crash_dump: during early boot, output to kmsg on userdebug." am: 72ca48e5cb
am: 35b7a274ac

Change-Id: Idda1bf55e654dd5e1eb72248572f9352671a3745
2017-04-10 21:08:07 +00:00
Josh Gao 35b7a274ac Merge "crash_dump: during early boot, output to kmsg on userdebug."
am: 72ca48e5cb

Change-Id: I7af41a7a0040ec2b04367042ff1afffb732fb316
2017-04-10 21:03:35 +00:00
Josh Gao 72ca48e5cb Merge "crash_dump: during early boot, output to kmsg on userdebug." 2017-04-10 20:51:59 +00:00
Steven Moreland c4289e6b4e Merge "Move early_hal start to late-fs trigger action" am: 9ef4417c8e
am: 2ad21de500

Change-Id: I884b8b874e751859ea7af4fd737e19f36d3b74c6
2017-04-08 04:58:41 +00:00
Steven Moreland 2ad21de500 Merge "Move early_hal start to late-fs trigger action"
am: 9ef4417c8e

Change-Id: Idb37ec8456a6c3855cb56128e79d9a02bdcc06c2
2017-04-08 04:54:11 +00:00
Steven Moreland 9ef4417c8e Merge "Move early_hal start to late-fs trigger action" 2017-04-08 04:46:58 +00:00
Tom Cherry 99b26e5ab1 Merge "init: clean up more headers" am: 4f6feec25b
am: a7d0718907

Change-Id: Id81a849349179715102d7d5956c67475ba0263b0
2017-04-07 23:08:48 +00:00
Tom Cherry a7d0718907 Merge "init: clean up more headers"
am: 4f6feec25b

Change-Id: Icd46443f3405b80c3f10981301eb931cc204d6a2
2017-04-07 23:04:49 +00:00
Treehugger Robot 4f6feec25b Merge "init: clean up more headers" 2017-04-07 22:56:32 +00:00
Janis Danisevskis ec0ab6524e Move early_hal start to late-fs trigger action
The class early_hal is essentially for the keymaster hal which needs
to be up before vold tries to unlock a storage encryption key (FDE or
FBE). The current position is too early in the boot process, because
on devices with legacy HAL the wrapper service uses system properties
to find the legacy HAL.

This patch moves the start of the early_hal class to the late-fs trigger
action which runs right after the system property action.

Test: Manually tested and update tested on bullhead, sailfish, and
      another device.
Bug: 35764921

Change-Id: I34b45b85f8450e9ef18861535fdb2ee963df8c9b
(cherry picked from commit 1ad8d21947)
2017-04-07 15:28:56 -07:00
Zhenhua WANG 48e0e59c25 Merge "NativeBridge: add "linked namespace" semantic corresponding to linker" am: 1238292db5
am: 21c8a291c5

Change-Id: I2758f0cf6ab85a46c9e09a12242ca7319487f367
2017-04-07 21:58:29 +00:00
Zhenhua WANG 21c8a291c5 Merge "NativeBridge: add "linked namespace" semantic corresponding to linker"
am: 1238292db5

Change-Id: I9200efa2d6c3f0d1b96b81e5c065f85f8b96b06f
2017-04-07 21:54:57 +00:00
Treehugger Robot 1238292db5 Merge "NativeBridge: add "linked namespace" semantic corresponding to linker" 2017-04-07 21:46:18 +00:00
Dan Willemsen ccb9230537 Merge "Add LLNDK liblog stub library for the VNDK" am: f8111b7df8
am: f79efedc98

Change-Id: I24911e084e79fea2ac5dfd677db71bff3e6c79a9
2017-04-07 21:35:36 +00:00
Dan Willemsen f79efedc98 Merge "Add LLNDK liblog stub library for the VNDK"
am: f8111b7df8

Change-Id: Ie167fac286868a3dd600ef5fd0d70a3dfa787468
2017-04-07 21:31:39 +00:00
Dan Willemsen f8111b7df8 Merge "Add LLNDK liblog stub library for the VNDK" 2017-04-07 21:21:32 +00:00
Tom Cherry f57c0bfab2 init: clean up more headers
We don't need everyone including <sys/system_properties.h>

Test: boot bullhead
Change-Id: I73d507e4f273678eaf15947725741e1e3b966cc6
2017-04-07 13:49:12 -07:00
Mark Salyzyn d98968eeda Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions" am: e800b97c46
am: 0c7f2287aa

Change-Id: I12c36cfc77b74cde942d8cd87a390df3912c6cfd
2017-04-07 19:38:05 +00:00
Mark Salyzyn 0c7f2287aa Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions"
am: e800b97c46

Change-Id: Ie4114f6e1439e60ca7ae8f72e4feddaa31e7d231
2017-04-07 19:34:05 +00:00
Treehugger Robot e800b97c46 Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions" 2017-04-07 19:25:34 +00:00
Vijay Venkatraman cb5474b140 Merge "Moved all files from include/system to libsystem/include/system" am: deb32544ba
am: 38a5bead70

Change-Id: Idfa9068920e50f6554ac236eb44474853cae8cd2
2017-04-07 18:36:00 +00:00
Vijay Venkatraman 38a5bead70 Merge "Moved all files from include/system to libsystem/include/system"
am: deb32544ba

Change-Id: I72a55fad9e5124646b94b13557f1485c8607744c
2017-04-07 18:31:31 +00:00
Mark Salyzyn f1a6ba96f3 Merge "liblog: adapt to removal of property name size limit" am: 7660c46c66
am: 3b3811b645

Change-Id: I08bac0a8486d22d376ac119b6d08bdb2371e7840
2017-04-07 18:31:30 +00:00
Vijay Venkatraman deb32544ba Merge "Moved all files from include/system to libsystem/include/system" 2017-04-07 18:28:47 +00:00
Mark Salyzyn 3b3811b645 Merge "liblog: adapt to removal of property name size limit"
am: 7660c46c66

Change-Id: Ie6c5aa2e9b5639d0d408484d56cc59c43eb9dd83
2017-04-07 18:27:30 +00:00
Treehugger Robot 7660c46c66 Merge "liblog: adapt to removal of property name size limit" 2017-04-07 18:22:07 +00:00
Mark Salyzyn d24dc95e87 liblog: adapt to removal of property name size limit
There is no longer a name size limit to the properties.

Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Test: liblog-benchmarks BM_is_loggable
Bug: 36696208
Change-Id: I80706a48583192b21f532a06cb8fa183a34e5f76
2017-04-07 18:18:18 +00:00
Mark Salyzyn 6e9cb8fd79 libcutils: fs_config: target_out_path assumed /system breaking partitions
Strip off trailing / then /system and then add back the appropriate
config directory.  This fixes an issue with reading vendor, oem or odm
partitions.

Test: manual build successfully interprets all etc/fs_config_* files.
Test: manual incremental build successfully interprets all etc/fs_config_* files.
Bug: 36071012
Change-Id: Iba363f0731bb8d15e595bb45c56db97722edabc2
2017-04-07 10:29:51 -07:00
Christopher Ferris f6defd3e09 Merge "Implement maps parsing." am: 33e6b18d35
am: d58265e72a

Change-Id: Ic93d2af4e13289605d0a4cd03176e189cb7e7b23
2017-04-07 16:58:06 +00:00
Christopher Ferris d58265e72a Merge "Implement maps parsing."
am: 33e6b18d35

Change-Id: I1673e501a90c559bc491c929e21bca6f6cec3a22
2017-04-07 16:53:40 +00:00
Christopher Ferris 33e6b18d35 Merge "Implement maps parsing." 2017-04-07 16:45:36 +00:00
Dan Cashman e85e8d58d5 Merge "Reflect move of mapping file to /system." am: a74635d33e
am: 6f18343656

Change-Id: I8686371490d33820be555afc5a691c8b39018c4f
2017-04-07 14:35:14 +00:00
Dan Cashman 6f18343656 Merge "Reflect move of mapping file to /system."
am: a74635d33e

Change-Id: Idf88cf223deb529faef0f805e5dc301e5ff92172
2017-04-07 14:30:47 +00:00
Treehugger Robot a74635d33e Merge "Reflect move of mapping file to /system." 2017-04-07 14:25:33 +00:00
Tom Cherry d93ffe7260 Merge "init: more header cleanup" am: ab5ab1ebd4
am: 6510908bd1

Change-Id: I4652593443b18e91914eda674276ad4b37f96eb9
2017-04-07 02:56:00 +00:00
Tom Cherry 6510908bd1 Merge "init: more header cleanup"
am: ab5ab1ebd4

Change-Id: I1f7cdd93e96e47cadf9b80ba428d11a358a49176
2017-04-07 02:52:01 +00:00
Treehugger Robot ab5ab1ebd4 Merge "init: more header cleanup" 2017-04-07 02:44:07 +00:00
Thierry Strudel b00ea15291 Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" am: ad90763ab9
am: bb1c8f3691

Change-Id: Ib1a4273177f5591cde677ed0a339b1948d410731
2017-04-07 02:12:28 +00:00
Thierry Strudel bb1c8f3691 Merge "Revert "libcutils: fs_config: target_out_path assumed /system""
am: ad90763ab9

Change-Id: I132fc583194a7225b3572b226344e884a432caf6
2017-04-07 02:08:29 +00:00
Treehugger Robot ad90763ab9 Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" 2017-04-07 02:03:23 +00:00
Tom Cherry 3f5eaae526 init: more header cleanup
Remove includes of "log.h" that really want <android-base/logging.h>
Fix header include order
Remove headers included in .cpp files that their associated .h already includes
Remove some unused headers

Test: boot bullhead
Change-Id: I2b415adfe86a5c8bbe4fb1ebc53c7b0ee2253824
2017-04-06 18:06:34 -07:00
Adam Lesinski 3892b4be0f Merge "ZipWriter: Do not write DataDescriptor for STORED files" am: 47f5581927
am: b087e37d4c

Change-Id: Icb2d0a1e5903e270697e4c0cd701ecc696cfffb1
2017-04-07 00:44:22 +00:00
Adam Lesinski b087e37d4c Merge "ZipWriter: Do not write DataDescriptor for STORED files"
am: 47f5581927

Change-Id: I1c2fa98c84b699063b75fb04d41d6b36e00f6891
2017-04-07 00:41:21 +00:00
Thierry Strudel 29e0c8f1a9 Revert "libcutils: fs_config: target_out_path assumed /system"
This reverts commit 7130fb345d.

Bug: 36816191
Change-Id: I7d604d510865b1fa15781ffb4ad8b3e77ac44395
2017-04-07 00:34:03 +00:00
Adam Lesinski 47f5581927 Merge "ZipWriter: Do not write DataDescriptor for STORED files" 2017-04-07 00:33:20 +00:00
Tom Cherry 9cf2cd358c Merge "ueventd: Write tests for the get_*_symlinks() functions" am: e7fbd6a2b4
am: e6b70f5913

Change-Id: I517d4f966d9d8f743cb17824e78e0cfd63a048f9
2017-04-07 00:26:50 +00:00
Tom Cherry e6b70f5913 Merge "ueventd: Write tests for the get_*_symlinks() functions"
am: e7fbd6a2b4

Change-Id: Ia77a42ebcce14036c71b2885d39372a9a4456649
2017-04-07 00:23:22 +00:00
Tom Cherry e7fbd6a2b4 Merge "ueventd: Write tests for the get_*_symlinks() functions" 2017-04-07 00:14:03 +00:00
Adam Lesinski e2fa70bcb0 ZipWriter: Do not write DataDescriptor for STORED files
Older implementations of ZIP (Java's ZipInputStream) don't
like a Data Descriptor trailing after an uncompressed entry.

If the FILE is seekable, and the entry is uncompressed, seek
back to the header and write out the crc and sizes.

(cherry-pick of commit 639814d946)

Bug: 36686974
Test: make ziparchive_tests
Change-Id: I61664515e5afa3e2ba814874eeac847a2aaac319
2017-04-06 17:03:32 -07:00
Tom Cherry ff0cb987ce Merge "Add android::base::ScopeGuard" am: 5c3961c547
am: e24876879a

Change-Id: Iad9fef49c54c59567656413900768d532e4c0a7d
2017-04-06 22:48:54 +00:00