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

47643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bowgo Tsai
dded5259ef Merge "libfs_avb: support loading vbmeta structs from any partition" am: 8dd6e5922b am: 035e2855db 
am: 05025d7121

Change-Id: I5b26057c96d3e912754f02f377fe9142e6ca13f6
 2019-01-24 08:35:27 -08:00
Bowgo Tsai
05025d7121 Merge "libfs_avb: support loading vbmeta structs from any partition" am: 8dd6e5922b 
am: 035e2855db

Change-Id: I4aefa9ddb8149db42f52ad65b0239be3d91099ee
 2019-01-24 08:31:12 -08:00
Bowgo Tsai
035e2855db Merge "libfs_avb: support loading vbmeta structs from any partition" 
am: 8dd6e5922b

Change-Id: If427c749caaa10b1c5f2bf2c239c982175f37806
 2019-01-24 08:26:06 -08:00
Treehugger Robot
8dd6e5922b Merge "libfs_avb: support loading vbmeta structs from any partition" 2019-01-24 16:16:13 +00:00
Christopher Ferris
35f0de9390 Merge "Fix memory leak in UnwinderFromPid object." am: 3c1d6b836a am: e0e04a49aa 
am: b9c43caf5c

Change-Id: I7ffc6511231787b73d99de7febf8216361c00816
 2019-01-24 08:07:43 -08:00
Christopher Ferris
b9c43caf5c Merge "Fix memory leak in UnwinderFromPid object." am: 3c1d6b836a 
am: e0e04a49aa

Change-Id: I93394744468708e4380a9397de32b48c68f7e74f
 2019-01-24 07:46:12 -08:00
Christopher Ferris
e0e04a49aa Merge "Fix memory leak in UnwinderFromPid object." 
am: 3c1d6b836a

Change-Id: Ib56d1540c6a9835cb05084ddf66abfbfe44881da
 2019-01-24 07:31:56 -08:00
Christopher Ferris
3c1d6b836a Merge "Fix memory leak in UnwinderFromPid object." 2019-01-24 15:23:09 +00:00
Jiyong Park
51460dba19 Merge "Add search paths for asan build" am: 6b6259a083 am: 8e206db77b 
am: b00159449f

Change-Id: Ib9138ee5707a66226a04b704e804079b195da606
 2019-01-24 04:46:34 -08:00
Jiyong Park
b00159449f Merge "Add search paths for asan build" am: 6b6259a083 
am: 8e206db77b

Change-Id: I91817777e6ba0fed2bf7ca9474843c3430b1e973
 2019-01-24 04:41:04 -08:00
Jiyong Park
8e206db77b Merge "Add search paths for asan build" 
am: 6b6259a083

Change-Id: I2da933c3bb0d408bc6828fe9f8bd51fc4cd58f9d
 2019-01-24 04:33:45 -08:00
Treehugger Robot
6b6259a083 Merge "Add search paths for asan build" 2019-01-24 12:23:36 +00:00
LongPing Wei
1da9e6fd13 Merge "Do SetUpDmVerity only once for the same mount point" am: 24a2c1a70c am: 52389e07c7 
am: dd088ffef8

Change-Id: I2e3cb4963f3a4532a63d4c847914ee9b1fc51c28
 2019-01-24 03:40:23 -08:00
LongPing Wei
dd088ffef8 Merge "Do SetUpDmVerity only once for the same mount point" am: 24a2c1a70c 
am: 52389e07c7

Change-Id: I2866d327fb1d3354c65f3def0154b271f1eb52a4
 2019-01-24 03:37:11 -08:00
LongPing Wei
52389e07c7 Merge "Do SetUpDmVerity only once for the same mount point" 
am: 24a2c1a70c

Change-Id: I808ffa081b79a1e82652b749fbc227a0c892a01c
 2019-01-24 03:29:02 -08:00
Treehugger Robot
24a2c1a70c Merge "Do SetUpDmVerity only once for the same mount point" 2019-01-24 11:06:03 +00:00
Neil Fuller
254becca98 Merge "Add a symlink for the ICU .dat file" am: 792fd03955 am: 9ce21c1911 
am: 88d1451e98

Change-Id: I72f26533024f4202b69cb8893288c38cc15dc95f
 2019-01-24 02:36:05 -08:00
Neil Fuller
88d1451e98 Merge "Add a symlink for the ICU .dat file" am: 792fd03955 
am: 9ce21c1911

Change-Id: I35464fb674a8c9984dc85416b14b1a008eae2305
 2019-01-24 02:26:52 -08:00
Neil Fuller
9ce21c1911 Merge "Add a symlink for the ICU .dat file" 
am: 792fd03955

Change-Id: I448e65f17ed1d01a79646ce2b6c5f23293b3fc46
 2019-01-24 02:13:34 -08:00
Neil Fuller
792fd03955 Merge "Add a symlink for the ICU .dat file" 2019-01-24 10:02:26 +00:00
Bowgo Tsai
278749d74c libfs_avb: support loading vbmeta structs from any partition 
This commits adds the following two public functions into
class AvbHandle, and verified by 'libfs_avb_test':

static AvbUniquePtr LoadAndVerifyVbmeta();  // loads inline vbmeta.
static AvbUniquePtr LoadAndVerifyVbmeta(    // loads offline vbmeta.
    const std::string& partition_name, const std::string& ab_suffix,
    const std::string& ab_other_suffix, const std::string& expected_public_key,
    const HashAlgorithm& hash_algorithm, bool allow_verification_error,
    bool load_chained_vbmeta, bool rollback_protection,
    std::function<std::string(const std::string&)> custom_device_path = nullptr);

The first function LoadAndVerifyVbmeta() will be used to replace Open(),
in a separate CL in the future. Many libfs_avb internal utils are added
into avb_util.cpp as well, which are verified by
'libfs_avb_internal_test'.

Bug: 112103720
Bug: 117960205
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Change-Id: I807b8af0b69c9a4511f6f120e9754aca5442830e
 2019-01-24 17:43:25 +08:00
Suren Baghdasaryan
d6bf6405c1 Merge changes from topic "revert move sched_policy functions" am: 7e15ad7ecb am: 68de855630 
am: fe7e4de045

Change-Id: Icb04381a4c421ceb543616db1c8f3d965d0484b1
 2019-01-23 23:37:20 -08:00
Suren Baghdasaryan
fe7e4de045 Merge changes from topic "revert move sched_policy functions" am: 7e15ad7ecb 
am: 68de855630

Change-Id: Iedbb93680183c8539c131690b345bc54263fdcd3
 2019-01-23 23:31:42 -08:00
Suren Baghdasaryan
1a9c55cc5d [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK" am: c4a02d25a9 -s ours am: 88fe832bd1 -s ours 
am: 83af010b08 -s ours
am skip reason: subject contains skip directive

Change-Id: I63b5e75e5b5d8062e8faeb100b2010193df51bb4
 2019-01-23 23:30:17 -08:00
Suren Baghdasaryan
83af010b08 [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK" am: c4a02d25a9 -s ours 
am: 88fe832bd1 -s ours
am skip reason: subject contains skip directive

Change-Id: I9cebea94be96453006f637eadfaa86604d2477cb
 2019-01-23 23:17:40 -08:00
Suren Baghdasaryan
68de855630 Merge changes from topic "revert move sched_policy functions" 
am: 7e15ad7ecb

Change-Id: Id58a376e5e0216cf01ce201ed3061d5b8d7e8d5b
 2019-01-23 23:13:38 -08:00
Suren Baghdasaryan
88fe832bd1 [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK" 
am: c4a02d25a9 -s ours
am skip reason: subject contains skip directive

Change-Id: I9131c17d5fc372db05699f1aca5138fba1237c7a
 2019-01-23 23:08:47 -08:00
Suren Baghdasaryan
7e15ad7ecb Merge changes from topic "revert move sched_policy functions" 
* changes:
  DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
  DO NOT MERGE: Revert "libcutils: Move sched_policy functions into libprocessgroup"
  DO NOT MERGE: Revert "Add dependencies on libprocessgroup for sched_policy users"
 2019-01-24 06:57:55 +00:00
Hridya Valsaraju
24d53bfcda Merge "Modify mkbootimg.py to support boot image header version 2" am: ed3f1a584a am: 91e94c1f19 
am: 7b22c862d0

Change-Id: I50531ccf38682d044f7e57e3bddd8784cc2fd2ad
 2019-01-23 22:31:31 -08:00
Jiyong Park
59e355c441 Add search paths for asan build 
Bug: 123292626
Test: aosp_cf_x86_pasan boots
Change-Id: Ifdc86285cbb2d7eb2b1e39983981e7b81aec59c9
 2019-01-24 15:08:06 +09:00
Hridya Valsaraju
7b22c862d0 Merge "Modify mkbootimg.py to support boot image header version 2" am: ed3f1a584a 
am: 91e94c1f19

Change-Id: I1c39ff5a092223f22c5ca2a18c083cbf89480a9a
 2019-01-23 21:56:06 -08:00
Hridya Valsaraju
91e94c1f19 Merge "Modify mkbootimg.py to support boot image header version 2" 
am: ed3f1a584a

Change-Id: I0e68ac2fa5c0fe25e5e479e411586cfd2c2f6a35
 2019-01-23 21:38:25 -08:00
Treehugger Robot
ed3f1a584a Merge "Modify mkbootimg.py to support boot image header version 2" 2019-01-24 05:33:53 +00:00
Suren Baghdasaryan
c4a02d25a9 DO NOT MERGE: Revert "Add libprocessgroup into VNDK" 
This reverts commit dad4749731.

Reason for revert: Broke AOSP

Change-Id: I019e1226a65b31495984cf47ad471771b4880c45
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
 2019-01-23 20:44:47 -08:00
Suren Baghdasaryan
b5394db682 DO NOT MERGE: Revert "libcutils: Move sched_policy functions into libprocessgroup" 
This reverts commit facd40d0e1.

Reason for revert: Broke AOSP

Change-Id: Id333417d4970ced800ab801bddfed880cafa056d
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
 2019-01-23 20:44:09 -08:00
Suren Baghdasaryan
1bef8c550c DO NOT MERGE: Revert "Add dependencies on libprocessgroup for sched_policy users" 
This reverts commit 02843339f9.

Reason for revert: Broke AOSP

Change-Id: I62f91c0adf440b5da0a145862b04dd27a7016faf
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
 2019-01-23 20:43:28 -08:00
David Anderson
6ea7bd731c Merge "Expose IsFilePinned through FiemapWriter." am: c98b1efd4c am: 593109f5ca 
am: 48ef6f9738

Change-Id: I010b3af6bfe1850a3de8064f5b3a1f1b1aa2b73c
 2019-01-23 19:54:35 -08:00
David Anderson
48ef6f9738 Merge "Expose IsFilePinned through FiemapWriter." am: c98b1efd4c 
am: 593109f5ca

Change-Id: Ie9f1b86b3518a4a52aa648268b6fb516455be528
 2019-01-23 19:25:28 -08:00
Justin Yun
8d43e3b369 Merge "vndk: do not use prebuilt ld.config.<ver>.txt" am: e72308c6b1 am: 2ab4e5a353 
am: e1ae4b40c5

Change-Id: Ida915f98b5b87b1c5ea31cb0d18d83f39d186f8b
 2019-01-23 19:24:12 -08:00
David Anderson
593109f5ca Merge "Expose IsFilePinned through FiemapWriter." 
am: c98b1efd4c

Change-Id: Ib9c9b8cc0d91da4b9354776e7c27972ff6e222cf
 2019-01-23 19:22:04 -08:00
David Anderson
c98b1efd4c Merge "Expose IsFilePinned through FiemapWriter." 2019-01-24 03:14:55 +00:00
Justin Yun
e1ae4b40c5 Merge "vndk: do not use prebuilt ld.config.<ver>.txt" am: e72308c6b1 
am: 2ab4e5a353

Change-Id: I4b6c5e8472a023fff879b7df34e2866462032c0c
 2019-01-23 19:01:50 -08:00
Justin Yun
2ab4e5a353 Merge "vndk: do not use prebuilt ld.config.<ver>.txt" 
am: e72308c6b1

Change-Id: I913b42ed9a3ddffb380b1cce0d15ee352824a4c7
 2019-01-23 18:56:00 -08:00
Treehugger Robot
e72308c6b1 Merge "vndk: do not use prebuilt ld.config.<ver>.txt" 2019-01-24 02:47:06 +00:00
Chris Wailes
47fe7322f4 [automerger skipped] Merge "Added a new socket to Zygote init scripts." am: a8bd23124c am: 9abd069f4d 
am: d62d80735d -s ours
am skip reason: change_id I5dbb87770b1a3100c6c122bb39ca854006bb0b0d with SHA1 ca11579b6c is in history

Change-Id: Id3dab7d8351c52c21510b451e13055e600037317
 2019-01-23 18:04:44 -08:00
Chris Wailes
d62d80735d Merge "Added a new socket to Zygote init scripts." am: a8bd23124c 
am: 9abd069f4d

Change-Id: Icd292f8c4d23264c14c02977c1687b9b56c20be5
 2019-01-23 17:42:10 -08:00
Chris Wailes
9abd069f4d Merge "Added a new socket to Zygote init scripts." 
am: a8bd23124c

Change-Id: Ibc67ef1c3010e5feba535654d248de9b60f1136b
 2019-01-23 17:33:09 -08:00
Treehugger Robot
a8bd23124c Merge "Added a new socket to Zygote init scripts." 2019-01-24 01:11:58 +00:00
LongPing Wei
9f2e84e507 Do SetUpDmVerity only once for the same mount point 
SetUpDmVerity won't return true twice for the same partition and it will
leads to failure when verify-boot is enabled on multi-fstab-lines.

Test: make
Change-Id: I5ce35e9c6b2d47fd0f599e36046e1ad2b0a35ffa
 2019-01-23 23:30:13 +00:00
David Anderson
c7ca3b6760 Expose IsFilePinned through FiemapWriter. 
This is needed for gsid to verify whether a file is pinned.

Bug: 122556707
Test: manual test
Change-Id: I662402294028597241ce11f86421f6ebb4a3cd6b
 2019-01-23 13:54:19 -08:00