Mark Salyzyn
d98968eeda
Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions" am: e800b97c46
...
am: 0c7f2287aa
2017-04-07 19:38:05 +00:00
Mark Salyzyn
0c7f2287aa
Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions"
...
am: e800b97c46
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
2017-04-07 18:36:00 +00:00
Mark Salyzyn
755cdc6173
Merge "liblog: adapt to removal of property name size limit" am: 7660c46c66 am: 3b3811b645
...
am: f1a6ba96f3
2017-04-07 18:35:59 +00:00
Vijay Venkatraman
38a5bead70
Merge "Moved all files from include/system to libsystem/include/system"
...
am: deb32544ba
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
2017-04-07 18:31:30 +00:00
Mark Salyzyn
c18f3102da
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 11:29:44 -07: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
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
Zhenhua WANG
caf7750f3f
NativeBridge: add "linked namespace" semantic corresponding to linker
...
For dynamic linking perspective, semantics of NativeBridge needs to
align with dynamic linker. This patch adds "linked namespace" semantic
which shares some libraries from one namespace to another.
Bug: 37123321
Test: Fugu: netflix, play movies, youtube
Test: make test-art-host-run-test-115-native-bridge
cherry picked from commit e8fb11dfa1
2017-04-07 10:42:51 -07: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
328b6947d0
Merge "Implement maps parsing." am: 33e6b18d35 am: d58265e72a
...
am: f6defd3e09
2017-04-07 17:02:07 +00:00
Christopher Ferris
f6defd3e09
Merge "Implement maps parsing." am: 33e6b18d35
...
am: d58265e72a
2017-04-07 16:58:06 +00:00
Christopher Ferris
d58265e72a
Merge "Implement maps parsing."
...
am: 33e6b18d35
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
6e79d204d7
Merge "Reflect move of mapping file to /system." am: a74635d33e am: 6f18343656
...
am: e85e8d58d5
2017-04-07 14:38:46 +00:00
Dan Cashman
e85e8d58d5
Merge "Reflect move of mapping file to /system." am: a74635d33e
...
am: 6f18343656
2017-04-07 14:35:14 +00:00
Dan Cashman
6f18343656
Merge "Reflect move of mapping file to /system."
...
am: a74635d33e
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
Janis Danisevskis
a074e16357
Merge "Move early_hal start to late-fs trigger action" into oc-dev
...
am: 9cadfde2d6
2017-04-07 06:11:58 +00:00
TreeHugger Robot
9cadfde2d6
Merge "Move early_hal start to late-fs trigger action" into oc-dev
2017-04-07 06:08:08 +00:00
Tom Cherry
25c351ccb8
Merge "init: more header cleanup" am: ab5ab1ebd4 am: 6510908bd1
...
am: d93ffe7260
2017-04-07 02:59:38 +00:00
Tom Cherry
d93ffe7260
Merge "init: more header cleanup" am: ab5ab1ebd4
...
am: 6510908bd1
2017-04-07 02:56:00 +00:00
Tom Cherry
6510908bd1
Merge "init: more header cleanup"
...
am: ab5ab1ebd4
2017-04-07 02:52:01 +00:00
Treehugger Robot
ab5ab1ebd4
Merge "init: more header cleanup"
2017-04-07 02:44:07 +00:00
Janis Danisevskis
1ad8d21947
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
2017-04-07 02:30:18 +00:00
Thierry Strudel
9c2029b1d0
Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" am: ad90763ab9 am: bb1c8f3691
...
am: b00ea15291
2017-04-07 02:16:59 +00:00
Thierry Strudel
b00ea15291
Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" am: ad90763ab9
...
am: bb1c8f3691
2017-04-07 02:12:28 +00:00
Thierry Strudel
bb1c8f3691
Merge "Revert "libcutils: fs_config: target_out_path assumed /system""
...
am: ad90763ab9
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
c2b1bcac98
Merge "ZipWriter: Do not write DataDescriptor for STORED files" am: 47f5581927 am: b087e37d4c
...
am: 3892b4be0f
2017-04-07 00:48:23 +00:00
Adam Lesinski
3892b4be0f
Merge "ZipWriter: Do not write DataDescriptor for STORED files" am: 47f5581927
...
am: b087e37d4c
2017-04-07 00:44:22 +00:00
Adam Lesinski
b087e37d4c
Merge "ZipWriter: Do not write DataDescriptor for STORED files"
...
am: 47f5581927
2017-04-07 00:41:21 +00:00
Thierry Strudel
29e0c8f1a9
Revert "libcutils: fs_config: target_out_path assumed /system"
...
This reverts commit 7130fb345d
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
f2cb84724b
Merge "ueventd: Write tests for the get_*_symlinks() functions" am: e7fbd6a2b4 am: e6b70f5913
...
am: 9cf2cd358c
2017-04-07 00:30:23 +00:00
Tom Cherry
9cf2cd358c
Merge "ueventd: Write tests for the get_*_symlinks() functions" am: e7fbd6a2b4
...
am: e6b70f5913
2017-04-07 00:26:50 +00:00
Tom Cherry
e6b70f5913
Merge "ueventd: Write tests for the get_*_symlinks() functions"
...
am: e7fbd6a2b4
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
2017-04-06 17:03:32 -07:00
Tom Cherry
c0d7642347
Merge "Add android::base::ScopeGuard" am: 5c3961c547 am: e24876879a
...
am: ff0cb987ce
2017-04-06 22:52:53 +00:00
Tom Cherry
ff0cb987ce
Merge "Add android::base::ScopeGuard" am: 5c3961c547
...
am: e24876879a
2017-04-06 22:48:54 +00:00
Tom Cherry
e24876879a
Merge "Add android::base::ScopeGuard"
...
am: 5c3961c547
2017-04-06 22:45:29 +00:00
Tom Cherry
5c3961c547
Merge "Add android::base::ScopeGuard"
2017-04-06 22:41:02 +00:00
Liu Changcheng
19776df89a
Merge "check send_signal result before further dealing" am: 5830f7b564 am: 381a13555d
...
am: 3f6ec84478
2017-04-06 22:39:20 +00:00
Liu Changcheng
3f6ec84478
Merge "check send_signal result before further dealing" am: 5830f7b564
...
am: 381a13555d
2017-04-06 22:35:46 +00:00
