p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
55,301 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

55301 Commits

Author SHA1 Message Date
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
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
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
Colin Cross 7deabe55c9 Merge "Make javamicro a plugin" am: c61d0f966b am: fb4c69eebc am: 6c67eb9837 am: e982683c38 
am: b8e58b16df

Change-Id: Ib4d677410b8446d30e7957209f3a222939afcbc8
 2019-08-15 15:57:25 -07:00
Colin Cross b8e58b16df Merge "Make javamicro a plugin" am: c61d0f966b am: fb4c69eebc am: 6c67eb9837 
am: e982683c38

Change-Id: I79f149be64b2780831408cd0daeaaaf0434f2edc
 2019-08-15 15:30:57 -07:00
Colin Cross e982683c38 Merge "Make javamicro a plugin" am: c61d0f966b am: fb4c69eebc 
am: 6c67eb9837

Change-Id: Ic34d05315c4d79d7637d4141fc0dc91e7c2f385a
 2019-08-15 13:58:29 -07:00
Colin Cross 6c67eb9837 Merge "Make javamicro a plugin" am: c61d0f966b 
am: fb4c69eebc

Change-Id: Iedaa4b1d2386c3f77696440ed0a2eee9cf1fcfcd
 2019-08-15 13:35:17 -07:00
Colin Cross fb4c69eebc Merge "Make javamicro a plugin" 
am: c61d0f966b

Change-Id: Ie4a9eca7b0fc9043f777947cf2cf3898f37c7c24
 2019-08-15 13:13:23 -07:00
Tao Bao 07997f1bb4 Stop packing system/update_engine/scripts. 
We once attempted to use them (by importing from releasetools scripts)
to parse payload. Due to the dependency on google.protobuf, we have
switched to delta_generator instead (commit 750385e4).

Bug: 65261072
Test: `m -j otatools-package`; and check the related scripts are not
      included.
Change-Id: Iaa8bcb0e2792e48512e1b8db29869db875ba8dc9
 2019-08-15 12:10:05 -07:00
Treehugger Robot c61d0f966b Merge "Make javamicro a plugin" 2019-08-15 18:18:38 +00:00
Amy Zhang 74c0f90e47 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" 2019-08-15 18:02:50 +00:00
Anton Hansson 303feef04f Cleanup aosp_product whitelist am: c2a5e48d82 am: 40cc963c04 am: 2fbf135539 
am: fafd5642ed

Change-Id: Ia23825159d1c3d858913369bbecdaf791a9dd71a
 2019-08-15 10:15:55 -07:00
Anton Hansson fafd5642ed Cleanup aosp_product whitelist am: c2a5e48d82 am: 40cc963c04 
am: 2fbf135539

Change-Id: I1782294b6ca014b8869ef08efc766a44336dcda9
 2019-08-15 10:06:53 -07:00
Anton Hansson 2fbf135539 Cleanup aosp_product whitelist am: c2a5e48d82 
am: 40cc963c04

Change-Id: I1061093317e78d9525ab994668e37bbc85a81cce
 2019-08-15 09:56:49 -07:00
Anton Hansson 40cc963c04 Cleanup aosp_product whitelist 
am: c2a5e48d82

Change-Id: Icc231bbe97fa232c845532d04af2da16116e3a11
 2019-08-15 09:46:27 -07:00
Anton Hansson c2a5e48d82 Cleanup aosp_product whitelist 
These files are build by mainline_system now.

Bug: 138280590
Test: lunch aosp_arm64; m nothing
Change-Id: Icff82e94c538d4e35ca5e73d04b6f02d6731df4c
 2019-08-15 12:33:33 +01:00