Commit Graph

55314 Commits

Author SHA1 Message Date
Tianjie Xu 8e3b7f18d0 Merge "Generate block based OTA for product partitions" am: 2211352eed am: d4400ca15f am: 6cc77a09ce am: 14c6434a11
am: cbbabf4cce

Change-Id: I1206abf252e6709bf34e1154c275f13b433daa79
2019-08-20 14:25:24 -07:00
Tianjie Xu cbbabf4cce Merge "Generate block based OTA for product partitions" am: 2211352eed am: d4400ca15f am: 6cc77a09ce
am: 14c6434a11

Change-Id: Iecf13304303c06d3311fdef6073547370f6675d1
2019-08-20 14:14:32 -07:00
Tianjie Xu 14c6434a11 Merge "Generate block based OTA for product partitions" am: 2211352eed am: d4400ca15f
am: 6cc77a09ce

Change-Id: I4cf66ab837f0dc32a18f1b905f573859db6538c8
2019-08-20 14:02:44 -07:00
Tianjie Xu 6cc77a09ce Merge "Generate block based OTA for product partitions" am: 2211352eed
am: d4400ca15f

Change-Id: Id77e192bd8cc674dba7e05fff16e20c30ad7bb38
2019-08-20 13:50:44 -07:00
Tianjie Xu d4400ca15f Merge "Generate block based OTA for product partitions"
am: 2211352eed

Change-Id: Ib36f9dde2982d77fdd2a8a74d2e80d7a8b21326e
2019-08-20 13:39:52 -07:00
Tianjie Xu 2211352eed Merge "Generate block based OTA for product partitions" 2019-08-20 20:01:33 +00:00
Tianjie Xu f67dd8059d Generate block based OTA for product partitions
Currently only the system and vendor partitions are updated in the
generic block based OTA generation script. Since the product partition
is quite large and consist most of APK files, it would be beneficial to
update it similar to system. Handle the odm and system_ext partitions in
the same way as well.

Bug: 132683080
Test: Run unit tests, generate full and incremental OTA with product partitions.
Change-Id: I13478cf9bd32137c6729b8c9cb102080147093f2
2019-08-20 00:18:00 -07:00
Howard Chen c64664d693 Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master am: f65d253f07 am: 3043018fd0 am: bc7316fd0c
am: 75ff1f880e

Change-Id: I260f3acbf2af991a96805ef1b34f86fd012ed25e
2019-08-19 19:09:53 -07:00
Howard Chen 75ff1f880e Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master am: f65d253f07 am: 3043018fd0
am: bc7316fd0c

Change-Id: Ie0d76dc3b338cd88a027474899cbf3516fbacca2
2019-08-19 18:56:53 -07:00
Howard Chen bc7316fd0c Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master am: f65d253f07
am: 3043018fd0

Change-Id: I1146024ec2912e8426f14d8710dea67781085860
2019-08-19 18:47:47 -07:00
Howard Chen 3043018fd0 Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master
am: f65d253f07

Change-Id: I5bc4ec7f1826cb3ded522967fd138eb0f4f59d3c
2019-08-19 18:35:46 -07:00
Paul Trautrim d706864490 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac am: bb78e6bfb8 am: bbcbababe7 am: 0104c9bbe1
am: 6319f2ac49

Change-Id: I983663eb2d25e3081d9e17830dd35720942b685e
2019-08-19 18:25:49 -07:00
TreeHugger Robot f65d253f07 Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master 2019-08-20 01:19:32 +00:00
Paul Trautrim 6319f2ac49 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac am: bb78e6bfb8 am: bbcbababe7
am: 0104c9bbe1

Change-Id: I063b7eb135a033bc88fa7f2526d5422eb2d1cd3a
2019-08-19 18:14:47 -07:00
Paul Trautrim 0104c9bbe1 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac am: bb78e6bfb8
am: bbcbababe7

Change-Id: I7478a1556fbbac8b031626ac18ba12fbfd17f428
2019-08-19 18:04:44 -07:00
Paul Trautrim bbcbababe7 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac
am: bb78e6bfb8

Change-Id: I5928cc2d7c1620fee5750a026f10912af4899be4
2019-08-19 17:53:41 -07:00
Paul Trautrim bb78e6bfb8 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
am: 23b46e54ac

Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
2019-08-19 17:43:39 -07:00
Paul Trautrim 23b46e54ac Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" 2019-08-20 00:07:35 +00:00
Paul Trautrim 7d5b3f670d Merge "Use --add_missing in merge_target_files.py" am: cc875c1482 am: 6c3aa71d1b am: 0621e17353 am: f149e7190a
am: 95be87328e

Change-Id: I69005a73fd3154b350e33dbb8bc9d97fcb1956cb
2019-08-19 04:46:45 -07:00
Paul Trautrim 95be87328e Merge "Use --add_missing in merge_target_files.py" am: cc875c1482 am: 6c3aa71d1b am: 0621e17353
am: f149e7190a

Change-Id: I311c9b9944e9cfda6061e1ea0a8cfb9d27023d1a
2019-08-19 04:36:41 -07:00
Paul Trautrim f149e7190a Merge "Use --add_missing in merge_target_files.py" am: cc875c1482 am: 6c3aa71d1b
am: 0621e17353

Change-Id: I1d65555932177cc8c959e2c23dd3987890c780ea
2019-08-19 04:26:46 -07:00
Paul Trautrim 0621e17353 Merge "Use --add_missing in merge_target_files.py" am: cc875c1482
am: 6c3aa71d1b

Change-Id: Iac0dba435fe0da04e7d014f7600f1e2c90a8c5bb
2019-08-19 04:15:39 -07:00
Paul Trautrim 6c3aa71d1b Merge "Use --add_missing in merge_target_files.py"
am: cc875c1482

Change-Id: I0abe618a8e1900c57b67060361b46807531cddd7
2019-08-19 04:05:40 -07:00
Paul Trautrim cc875c1482 Merge "Use --add_missing in merge_target_files.py" 2019-08-19 10:50:35 +00:00
Howard Chen 05f553aa5d Fix boot failure on Q devices with GSI on master
The master GSI is required to support both P and Q.

Bug: 136695702
Test: Boot a Q device with GSI on master
Change-Id: Ic6da4c4a81d145414ba6cb1bde1ccf3b4a8150f1
2019-08-18 23:16:02 +00:00
nelsonli 8311a92538 Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4 am: 7dc1cbe13c am: 5530deacd9 am: 13586d7aa0
am: 5ba1c3c713

Change-Id: Iefce3247a67aefecee92a31b35c1404bab9d3039
2019-08-15 19:48:12 -07:00
Paul Scovanner 5abdac031a [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: 0a9ed1cc08 am: b431516ce5
am: ac7b832447 -s ours
am skip reason: subject contains skip directive

Change-Id: I1206688cea7440f95c1448b517669ae0d274da9b
2019-08-15 19:30:44 -07:00
Tao Bao 681794907e Merge "Merge "Stop packing system/update_engine/scripts." am: d994b4c062 am: 22fa2f20ae am: b5de826520" into qt-r1-dev-plus-aosp am: 5a79920c47
am: 543cc0681f

Change-Id: Ica9b26c119ab6917c6271ec906ee70e86a9c79cd
2019-08-15 19:25:31 -07:00
nelsonli 5ba1c3c713 Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4 am: 7dc1cbe13c am: 5530deacd9
am: 13586d7aa0

Change-Id: I815d651103ffe4d562a2438c438951907da4c6fa
2019-08-15 19:25:24 -07:00
nelsonli 13586d7aa0 Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4 am: 7dc1cbe13c
am: 5530deacd9

Change-Id: Ie45c6e594d1eec0473b6f773ad33a50c6c1bec90
2019-08-15 19:11:22 -07:00
Paul Scovanner 0fac0b780c [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: b575bd5e24 am: 3548cdff49
am: f9fab8fed0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife1421179a38381d00a005f52d77e82d3782e307
2019-08-15 19:11:16 -07:00
nelsonli 5530deacd9 Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4
am: 7dc1cbe13c

Change-Id: I1963cfc0f1bcf56d1e86c4c91fec1ed7ee9eec59
2019-08-15 19:00:23 -07:00
Paul Scovanner ac7b832447 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: 0a9ed1cc08
am: b431516ce5

Change-Id: Ic1ad25a5ca9b774886815e75a0f83c25665223f2
2019-08-15 18:50:08 -07:00
nelsonli 7dc1cbe13c Merge "VTS: Add vts-core to the dependency of tests"
am: 1413925ac4

Change-Id: I6a2dd9858e0a9c30d1d08b0815c5fbc54e568c5c
2019-08-15 18:48:35 -07:00
Tao Bao 543cc0681f Merge "Merge "Stop packing system/update_engine/scripts." am: d994b4c062 am: 22fa2f20ae am: b5de826520" into qt-r1-dev-plus-aosp
am: 5a79920c47

Change-Id: I241712656373a5ca8e5fe28025368049722e8f58
2019-08-15 18:47:42 -07:00
Paul Scovanner f9fab8fed0 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: b575bd5e24
am: 3548cdff49

Change-Id: I2c732dd4549ec79dc00eb4f838b697e2a1c3c1db
2019-08-15 18:36:09 -07:00
Paul Scovanner 371233c38c [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: b575bd5e24 am: cc0234ba55
am: 8e640e626f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib694d841bd2f7d58a9d75fe2eefe7ddb52951503
2019-08-15 18:35:31 -07:00
Paul Scovanner 8e640e626f [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168 am: b575bd5e24
am: cc0234ba55

Change-Id: Ia1e1e8198b2e28c8e3174ce61afed68fb3d2f2fe
2019-08-15 18:24:35 -07:00
Treehugger Robot 1413925ac4 Merge "VTS: Add vts-core to the dependency of tests" 2019-08-16 01:21:02 +00:00
Paul Scovanner b431516ce5 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168
am: 0a9ed1cc08

Change-Id: Iba1a91213c545a1f0acff84b6bcb19459630cbe7
2019-08-15 18:13:11 -07:00
Paul Scovanner cc0234ba55 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168
am: b575bd5e24

Change-Id: I7d6d992265898dd27dbc4e0cf82cfd49479f56ed
2019-08-15 18:06:28 -07:00
Android Build Merger (Role) 5a79920c47 Merge "Merge "Stop packing system/update_engine/scripts." am: d994b4c062 am: 22fa2f20ae am: b5de826520" into qt-r1-dev-plus-aosp 2019-08-16 01:06:17 +00:00
Tao Bao 226d17559c Merge "Stop packing system/update_engine/scripts." am: d994b4c062 am: 22fa2f20ae
am: b5de826520

Change-Id: I0a8ebaa01c9274e89505e3f247cb2e4cce919aaf
2019-08-15 18:05:57 -07:00
Paul Scovanner 3548cdff49 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168
am: b575bd5e24

Change-Id: Ia61308d7e01b12df0d034bda19a168f64bfcd321
2019-08-15 18:05:26 -07:00
Paul Scovanner b575bd5e24 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours
am: e840881168

Change-Id: If3950a62061e980ca8418d2c3057663c05b7fdf2
2019-08-15 17:48:20 -07:00
Paul Scovanner 0a9ed1cc08 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours
am: e840881168

Change-Id: I5c514fba6bfbb889bab1285c7ccff279589b48ab
2019-08-15 17:46:25 -07:00
Paul Scovanner e840881168 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01
am: 3250cbd459 -s ours
am skip reason: subject contains skip directive

Change-Id: Icabb27f1fbad9a61104dd9a8421a5c87d1c18b64
2019-08-15 17:35:19 -07:00
Tao Bao b5de826520 Merge "Stop packing system/update_engine/scripts." am: d994b4c062
am: 22fa2f20ae

Change-Id: I051e5058bc83d15b227c98b77c131e53d88718c7
2019-08-15 17:32:09 -07:00
Tao Bao 22fa2f20ae Merge "Stop packing system/update_engine/scripts."
am: d994b4c062

Change-Id: Iaa3633d3c087d3962d3408c4aefe33037f68f430
2019-08-15 16:44:43 -07:00
Tao Bao d994b4c062 Merge "Stop packing system/update_engine/scripts." 2019-08-15 23:09:21 +00:00