bowgotsai
58bdac8d25
Include libavb in static libraries
...
Bug: 31264231
Test: compile
Change-Id: I1d84f7aa67a0ed31f2b6400cf1c9567bf503295a
8 years ago
Adrien Schildknecht
43100e580f
Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7
...
am: 93722ead06
Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176
8 years ago
Adrien Schildknecht
93722ead06
Manually merge commit 'b406ffa' into stage-aosp-master
...
am: 04c55e6ed7
Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6
8 years ago
The Android Automerger
04c55e6ed7
Manually merge commit 'b406ffa' into stage-aosp-master
...
* commit 'b406ffa':
Add support for creating ext4 images with mke2fs
BUG:33304034
8 years ago
Treehugger Robot
b406ffaa86
Merge "Add support for creating ext4 images with mke2fs"
8 years ago
Adrien Schildknecht
e0f409ca32
Add support for creating ext4 images with mke2fs
...
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
See b/23686092 for more informations.
To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period where both mke2fs
and make_ext4fs will be supported.
This patch does 3 things:
- add the necessary code to use mke2fs to format an ext4 partition;
- add a dependency to the binary used by vold.
Test: m -j32 with TARGET_USES_MKE2FS={,false,true}
TARGET_USERIMAGES_USE_EXT4={,true}
Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
8 years ago
Paul Crowley
6984a92aa9
Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa
am: 4f70554179
...
am: 32b7443757
Change-Id: I8b68a90f11d2b7b66085609a122515a68bac48bb
8 years ago
Paul Crowley
32b7443757
Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa
...
am: 4f70554179
Change-Id: I18b4e8c975342a0b79d9a88082c1e9b4f0a6682b
8 years ago
Paul Crowley
4f70554179
Merge "Remove misleading comment (b/26948053)"
...
am: dbeebf56aa
Change-Id: I6e63f700ecd9cad50956cc2a1cc34b4f81b1a497
8 years ago
Treehugger Robot
dbeebf56aa
Merge "Remove misleading comment (b/26948053)"
8 years ago
Rahul Chaudhry
543080cdf3
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am: cda5cec39f
...
am: e9e23bf019
Change-Id: Ic4e45522f591c296f6975f288c5dccd059b00314
8 years ago
Rahul Chaudhry
e9e23bf019
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
...
am: cda5cec39f
Change-Id: I5fdde841ee42e3a48c042538732f22f0fe3eedf9
8 years ago
Treehugger Robot
cda5cec39f
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
8 years ago
Rahul Chaudhry
1a077b440a
system/vold: cleanup compiler warnings (read of uninitialized memory).
...
system/vold/ScryptParameters.cpp:48:26: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:43: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:9: warning: Assigned value is
garbage or undefined
Bug: 26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I82ffffee48ee94ca5c7f3bbc64059f9cec109a92
8 years ago
Paul Crowley
99360d76e5
Remove misleading comment (b/26948053)
...
Vold is considered part of our trusted computing base, and
compromising vold is already identified as a complete device
compromise. While storing keys only in the kernel would be better, the
current setup does not introduce a security bug or worsen any security
control.
Bug: 26948053
Test: Comment-only change.
Change-Id: Ib5436f4386769ec44b74dc6b50fbcc0fed99b96b
8 years ago
Tao Bao
2af30c5439
Merge "Use libbootloader_message." am: 1dfd1df2e3
...
am: df161ae45b
Change-Id: I028c7712fd243d7d291add1b2864a198959a1d34
8 years ago
Tao Bao
df161ae45b
Merge "Use libbootloader_message."
...
am: 1dfd1df2e3
Change-Id: Id9c27a97fc7a6e67a706d9f2d837e42a960fa19a
8 years ago
Tao Bao
1dfd1df2e3
Merge "Use libbootloader_message."
8 years ago
Yabin Cui
889ed48e5f
Use libbootloader_message.
...
Bug: 29582118
Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
(cherry picked from commit 1fb5966fbb
)
8 years ago
Tao Bao
985d0805e7
Merge "Update the header path for ext4_utils." am: 6a18a6ddb5
am: 4759d1d637
...
am: e85d4467f5
Change-Id: I78ef6034fc2586383e70345bcd186875528c9ffc
8 years ago
Tao Bao
e85d4467f5
Merge "Update the header path for ext4_utils." am: 6a18a6ddb5
...
am: 4759d1d637
Change-Id: Ia2d03836b7c194f641aa2c75b113a0a87e84e397
8 years ago
Tao Bao
4759d1d637
Merge "Update the header path for ext4_utils."
...
am: 6a18a6ddb5
Change-Id: I9f82c4f612ce5287b24e53ef151b886b91b0a0d7
8 years ago
Tao Bao
6a18a6ddb5
Merge "Update the header path for ext4_utils."
8 years ago
Tao Bao
989fec2769
Update the header path for ext4_utils.
...
Test: mmma system/vold
Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
8 years ago
Andreas Gampe
32e3190d10
Merge "Vold: remove unused define" am: 7ac97f8e37
am: de114c0d89
...
am: dd0fc053d2
Change-Id: I2d223f85f22929ed531d6fabb86cfbe2727aa71b
8 years ago
Andreas Gampe
dd0fc053d2
Merge "Vold: remove unused define" am: 7ac97f8e37
...
am: de114c0d89
Change-Id: Ida80b4ef12a7fcccadd219c7a7a4151a6f1b6098
8 years ago
Andreas Gampe
de114c0d89
Merge "Vold: remove unused define"
...
am: 7ac97f8e37
Change-Id: I617533e47e28a8081f7a2f477bda0c44fb3ea992
8 years ago
Treehugger Robot
7ac97f8e37
Merge "Vold: remove unused define"
8 years ago
Andreas Gampe
1ee738cd45
Vold: remove unused define
...
Introduced in commit 36801cccf2
,
but never used.
Test: m
Bug: 31338270
Change-Id: I90bbab0208032b75b3700b02f0dc053b0e5ed38a
8 years ago
Dan Albert
5ee8b78072
Merge "Add missing include." am: 45b09e9144
am: 2ab88f0a77
...
am: 9d7bf437b0
Change-Id: Id77fcbc8bffc2e45a0b1d3f5e4ac5fdc195711be
8 years ago
Dan Albert
9d7bf437b0
Merge "Add missing include." am: 45b09e9144
...
am: 2ab88f0a77
Change-Id: I84171fb41e8cd0040da34891d9b527400ff49b3f
8 years ago
Dan Albert
2ab88f0a77
Merge "Add missing include."
...
am: 45b09e9144
Change-Id: I97b57690ed9cccd71b0c3d9b83fb1fd0f2e3d835
8 years ago
Treehugger Robot
45b09e9144
Merge "Add missing include."
8 years ago
Dan Albert
616b250ecf
Add missing include.
...
Test: mm
Bug: None
Change-Id: If3cbe642292016fdac603cce83f3ef252dda7481
8 years ago
Wei Wang
b2c339739b
Update fs_mgr_mount_all function am: 84c985e275
...
am: c3c04acae6
Change-Id: Iaf67826394328097426ea9ee605ec2908f67ebec
8 years ago
Wei Wang
c3c04acae6
Update fs_mgr_mount_all function
...
am: 84c985e275
Change-Id: Ia2d7410d092d7569c8f8873a101140db9320c019
8 years ago
Wei Wang
bb4611b43b
Merge "Update fs_mgr_mount_all function" am: 1d58bcf6d4
am: 554d8679e7
...
am: 02a52f1f10
Change-Id: Ie242ec19217b81a76dd3fd046ff8157bd3691381
8 years ago
Wei Wang
02a52f1f10
Merge "Update fs_mgr_mount_all function" am: 1d58bcf6d4
...
am: 554d8679e7
Change-Id: Id6a99695c437c37b60e8e03eff9ff60eb91707a0
8 years ago
Wei Wang
554d8679e7
Merge "Update fs_mgr_mount_all function"
...
am: 1d58bcf6d4
Change-Id: Ic0c4c94cc6432d42229b9f66d95ea64cd49fa5f6
8 years ago
Wei Wang
1d58bcf6d4
Merge "Update fs_mgr_mount_all function"
8 years ago
Wei Wang
84c985e275
Update fs_mgr_mount_all function
...
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit 1d6476c3c8
)
Bug: 30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
8 years ago
Wei Wang
c03f1798f7
Update fs_mgr_mount_all function
...
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit 1d6476c3c8
)
Bug: 30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
8 years ago
Jeff Sharkey
697cd037ad
DO NOT MERGE. Block adoptable storage when using FBE. am: 84be704af4
...
am: 1fbe38f424
Change-Id: I7331a05a5d40d8cf1d946971e86097e716580094
8 years ago
Jeff Sharkey
1fbe38f424
DO NOT MERGE. Block adoptable storage when using FBE.
...
am: 84be704af4
Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
8 years ago
Jeff Sharkey
84be704af4
DO NOT MERGE. Block adoptable storage when using FBE.
...
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet. So for now, prevent devices
from being adopted on FBE devices.
Bug: 30770036
Change-Id: I47639209161ee403ce13ea9a60da235e97c3fc30
(cherry picked from commit 1571751109
)
8 years ago
Chih-Hung Hsieh
3634db02a4
Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93
am: 9bf2a320e7
...
am: 1c1c4edb98
Change-Id: I0493425398506c29c364965eb20e45cdaa1f9f1f
8 years ago
Chih-Hung Hsieh
1c1c4edb98
Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93
...
am: 9bf2a320e7
Change-Id: I8e1288bd16b8a1c968d890412b5d1bdf03e9ae7a
8 years ago
Chih-Hung Hsieh
9bf2a320e7
Merge "Fix google-explicit-constructor warnings in system/vold."
...
am: a3bcf26d93
Change-Id: I109b4e68954de019827eddca2001f4bcac91130d
8 years ago
Treehugger Robot
a3bcf26d93
Merge "Fix google-explicit-constructor warnings in system/vold."
8 years ago
Chih-Hung Hsieh
a4353671b1
Fix google-explicit-constructor warnings in system/vold.
...
Bug: 28341362
Change-Id: I14344b0cba134570bf87e7d61aa03503735dd794
Test: build with WITH_TIDY=1
8 years ago