Tao Bao
38a54546ea
Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b am: 4a5a1e15a1
...
am: e45026effa
2017-09-14 01:07:05 +00:00
Tao Bao
e45026effa
Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b
...
am: 4a5a1e15a1
2017-09-14 00:43:53 +00:00
Tao Bao
4a5a1e15a1
Merge "Consider prebuilt vendor.img as having vendor partition."
...
am: 8a7b0dee6b
2017-09-14 00:25:48 +00:00
Adam Seaton
def9b7708b
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f am: eada8fa3e3
...
am: d848e46392
2017-09-13 23:12:13 +00:00
Adam Seaton
3575e244b3
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920 am: 54f1f70971
...
am: 6456146a74
2017-09-13 23:09:34 +00:00
Adam Seaton
d848e46392
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f
...
am: eada8fa3e3
2017-09-13 23:07:24 +00:00
Adam Seaton
6456146a74
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
...
am: 54f1f70971
2017-09-13 23:06:36 +00:00
Adam Seaton
08d4f51c63
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f am: eada8fa3e3
...
am: ac9cd77574
2017-09-13 22:54:23 +00:00
Adam Seaton
8f5f5a70e4
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920 am: 54f1f70971
...
am: b1579af4fb
2017-09-13 22:53:51 +00:00
Adam Seaton
ac9cd77574
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f
...
am: eada8fa3e3
2017-09-13 22:50:43 +00:00
Adam Seaton
b1579af4fb
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
...
am: 54f1f70971
2017-09-13 22:49:34 +00:00
Adam Seaton
0a7c51b3a6
Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
...
am: 1bc297f5a4
2017-09-13 22:32:16 +00:00
Adam Seaton
668d061750
Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb
...
am: 3d2a4f8363
2017-09-13 22:32:03 +00:00
Adam Seaton
eada8fa3e3
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours
...
am: e9263f666f
2017-09-13 22:25:08 +00:00
Adam Seaton
54f1f70971
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours
...
am: 26bba7b920
2017-09-13 22:24:25 +00:00
Adam Seaton
c6f2363c5e
Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
...
am: db4b460d4b
2017-09-13 22:15:19 +00:00
Adam Seaton
eb202ed342
Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb
...
am: 813eb5e81d
2017-09-13 22:15:05 +00:00
Tao Bao
8a7b0dee6b
Merge "Consider prebuilt vendor.img as having vendor partition."
2017-09-13 22:10:43 +00:00
Adam Seaton
e9263f666f
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd
...
am: dd45809495
2017-09-13 22:01:01 +00:00
Adam Seaton
26bba7b920
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda
...
am: 6b626cb4c6
2017-09-13 22:00:29 +00:00
Adam Seaton
db4b460d4b
Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
...
am: 6b7c615cb6
2017-09-13 21:56:15 +00:00
Adam Seaton
813eb5e81d
Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
...
am: 8e3eac06fb
2017-09-13 21:56:02 +00:00
Adam Seaton
1bc297f5a4
Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
...
am: 6b7c615cb6
2017-09-13 21:52:55 +00:00
Adam Seaton
3d2a4f8363
Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
...
am: 8e3eac06fb
2017-09-13 21:52:44 +00:00
Steve Muckle
cf990d5acb
Merge "get kernel configs from kernel/configs" am: b4a3124822 am: 634ab481da
...
am: dff8364c97
2017-09-13 21:51:12 +00:00
Adam Seaton
dd45809495
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8
...
am: 0b0e0bc4cd
2017-09-13 21:40:05 +00:00
Adam Seaton
6b626cb4c6
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd
...
am: 86e0337fda
2017-09-13 21:39:22 +00:00
Adam Seaton
6b7c615cb6
Update Security String to 2017-11-05 on oc-dev bug:65631379
...
am: d24487a2f2
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb
Update Security String to 2017-11-01 on oc-dev bug:65631379
...
am: 8f4a4c2131
2017-09-13 21:29:44 +00:00
Steve Muckle
dff8364c97
Merge "get kernel configs from kernel/configs" am: b4a3124822
...
am: 634ab481da
2017-09-13 21:20:27 +00:00
Adam Seaton
0b0e0bc4cd
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770
...
am: a58425e0c8
2017-09-13 21:18:21 +00:00
Adam Seaton
86e0337fda
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8
...
am: 8d7c08cafd
2017-09-13 21:16:26 +00:00
Tao Bao
ad93142015
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev am: 2998812706 -s ours
...
am: 6dbd8a0b8c
2017-09-13 21:10:09 +00:00
Steve Muckle
634ab481da
Merge "get kernel configs from kernel/configs"
...
am: b4a3124822
2017-09-13 21:08:28 +00:00
Adam Seaton
a58425e0c8
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2
...
am: 59bbe44770
2017-09-13 20:50:38 +00:00
Adam Seaton
8d7c08cafd
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615
...
am: cbe21a52c8
2017-09-13 20:48:56 +00:00
Tao Bao
73a662b1df
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev am: 2998812706 -s ours
...
am: b67fd59f14
2017-09-13 20:36:15 +00:00
Tao Bao
b67fd59f14
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
...
am: 2998812706
2017-09-13 20:20:47 +00:00
Adam Seaton
59bbe44770
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours
...
am: a991b6acc2
2017-09-13 20:13:41 +00:00
Adam Seaton
cbe21a52c8
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379
...
am: 6f224a7615
2017-09-13 20:12:59 +00:00
Tao Bao
6dbd8a0b8c
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
...
am: 2998812706
2017-09-13 20:09:46 +00:00
Adam Seaton
a991b6acc2
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be
...
am: 33e8f674d7
2017-09-13 19:48:49 +00:00
Adam Seaton
33e8f674d7
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4
...
am: b691e678be
2017-09-13 19:38:15 +00:00
Steve Muckle
b4a3124822
Merge "get kernel configs from kernel/configs"
2017-09-13 19:33:19 +00:00
Adam Seaton
b691e678be
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64
...
am: 0bae3f0fa4
2017-09-13 19:33:16 +00:00
Adam Seaton
0bae3f0fa4
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379
...
am: 0c93452c64
2017-09-13 19:30:45 +00:00
Tao Bao
b22afea0f0
Consider prebuilt vendor.img as having vendor partition.
...
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.
For targets not using AVB, this change is no-op.
Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
2017-09-13 11:05:15 -07:00
Adam Seaton
d24487a2f2
Update Security String to 2017-11-05 on oc-dev bug:65631379
2017-09-13 10:51:18 -07:00
Adam Seaton
8f4a4c2131
Update Security String to 2017-11-01 on oc-dev bug:65631379
2017-09-13 10:46:41 -07:00
Adam Seaton
6f224a7615
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379
2017-09-13 10:35:29 -07:00
