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
Remi NGUYEN VAN
30d8199b87
Merge "Add a product build var for mainline module certs" am: a7832d5543
am: ff51a362fd
am: 79f85cbbca
am: c866dd5930
...
am: 09ecfdde00
Change-Id: Id7607f9f44e36e4c10f381cf8e06c81d077c1c98
2019-08-15 01:50:11 -07:00
Remi NGUYEN VAN
09ecfdde00
Merge "Add a product build var for mainline module certs" am: a7832d5543
am: ff51a362fd
am: 79f85cbbca
...
am: c866dd5930
Change-Id: I0f68ac37b60f95ef426a970073df55289a7f43fc
2019-08-15 01:41:10 -07:00
Remi NGUYEN VAN
c866dd5930
Merge "Add a product build var for mainline module certs" am: a7832d5543
am: ff51a362fd
...
am: 79f85cbbca
Change-Id: I2efda685d05b06d992e8dd7027cd36b88fe47ad6
2019-08-15 01:31:12 -07:00
Remi NGUYEN VAN
79f85cbbca
Merge "Add a product build var for mainline module certs" am: a7832d5543
...
am: ff51a362fd
Change-Id: I0f4991dfb7d9e84dae5f22b9a2c13295bbc3038d
2019-08-15 01:21:20 -07:00
Remi NGUYEN VAN
ff51a362fd
Merge "Add a product build var for mainline module certs"
...
am: a7832d5543
Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Xin Li
10b90c2fe7
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: c2852177bb
-s ours am: c801230025
-s ours am: af9d36715a
am: 7d3b80706a
...
am: a9d9df96f2
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie455b6ac7e456b00e3342db744f666a5b0958c5e
2019-08-15 00:52:33 -07:00
Treehugger Robot
a7832d5543
Merge "Add a product build var for mainline module certs"
2019-08-15 07:43:46 +00:00
Xin Li
a9d9df96f2
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: c2852177bb
-s ours am: c801230025
-s ours am: af9d36715a
...
am: 7d3b80706a
Change-Id: If85b58759492e63a092b4541956cad310cd8eabc
2019-08-15 00:32:47 -07:00
Xin Li
7d3b80706a
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: c2852177bb
-s ours am: c801230025
-s ours
...
am: af9d36715a
Change-Id: Ia9cdae8a9a300549437437ed6f227a8fa19d6723
2019-08-15 00:13:00 -07:00
Xin Li
af9d36715a
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: c2852177bb
-s ours
...
am: c801230025
-s ours
am skip reason: subject contains skip directive
Change-Id: Id6432055f8db2ba0febed140a780d2049772b2ea
2019-08-14 23:49:24 -07:00
Xin Li
c801230025
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: c2852177bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I31703244f0d5dec81d43625277ef1bce4d6ad570
2019-08-14 23:29:27 -07:00
Treehugger Robot
c2852177bb
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Tao Bao
9f361303fa
[automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4
-s ours am: 03e726ce10
-s ours am: d531e4f984
-s ours am: f595d3a216
-s ours
...
am: a656b2bb33
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: I306c6abcea580feda85b62371d3999a99242a817
2019-08-14 22:34:03 -07:00
Tao Bao
a656b2bb33
[automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4
-s ours am: 03e726ce10
-s ours am: d531e4f984
-s ours
...
am: f595d3a216
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: Id9d4be4fe586428b24d8ba1518751fdf57352018
2019-08-14 22:23:57 -07:00
Tao Bao
f595d3a216
[automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4
-s ours am: 03e726ce10
-s ours
...
am: d531e4f984
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: I7565e807525c18ad619e85c743d8d4662749d3b5
2019-08-14 22:13:51 -07:00
Tao Bao
d531e4f984
[automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4
-s ours
...
am: 03e726ce10
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: I46a6f921e67f78523b3940da59cff4bd065e2a17
2019-08-14 22:03:50 -07:00
Tao Bao
03e726ce10
[automerger skipped] Merge "Makefile uses add_img_to_target_files module."
...
am: 27480a0cf4
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: Ia777279685dc98bb7490380db88a31f32dac5921
2019-08-14 21:53:30 -07:00
Tao Bao
27480a0cf4
Merge "Makefile uses add_img_to_target_files module."
2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
7234d5e230
Merge "Add tags to lsdump_paths.txt" am: 7205361315
am: a489b755a0
am: c5a074798f
am: a44dbe5443
...
am: 8c2ff18afc
Change-Id: I253e700ffa1c5ed41b07b9dd4c07be09907e1430
2019-08-14 20:23:52 -07:00
Hsin-Yi Chen
8c2ff18afc
Merge "Add tags to lsdump_paths.txt" am: 7205361315
am: a489b755a0
am: c5a074798f
...
am: a44dbe5443
Change-Id: I59994a1213c5e3278e5ebf49bd0ca154ace5a9de
2019-08-14 20:13:49 -07:00
Hsin-Yi Chen
a44dbe5443
Merge "Add tags to lsdump_paths.txt" am: 7205361315
am: a489b755a0
...
am: c5a074798f
Change-Id: I8de9939fe9dddc1b4228801accba8ac7aadb5617
2019-08-14 20:03:42 -07:00
Paul Scovanner
5774856170
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 36c17b8465
am: 1e15d33232
...
am: cb6234b6df
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifbdcc7c00f61f2fa8b9c05766d3d782906e192c8
2019-08-14 20:03:29 -07:00
Paul Scovanner
9cac2a2326
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 5140669795
am: 0cafcd40dc
...
am: 61dfcf7964
-s ours
am skip reason: subject contains skip directive
Change-Id: I661cc2c9f3cbc3ca0a8e6e4b3676c6359320be0d
2019-08-14 19:57:42 -07:00
Paul Scovanner
0f6f13d207
Merge "Merge "Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2" into qt-r1-dev-plus-aosp am: 2021b3bc8e" into qt-qpr1-dev-plus-aosp
...
am: bbe3ffa293
Change-Id: Idfa2d21f593767c4809d9314533c27af0c760056
2019-08-14 19:56:57 -07:00
Paul Scovanner
bcb897a26e
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 5140669795
am: d77b00d4d0
...
am: 268197b376
-s ours
am skip reason: subject contains skip directive
Change-Id: I3e9f1c3c56b2325809a792cd6ae67b75fbca8ea8
2019-08-14 19:56:16 -07:00
Paul Scovanner
460cf44064
Merge "Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2
am: 50fa3d0d19" into qt-qpr1-dev-plus-aosp
...
am: 30114759cb
Change-Id: Ia118034c9c35ade8f8efbb06e257512f3f8e8cde
2019-08-14 19:55:22 -07:00
Paul Scovanner
3dc48fb48c
Update Security Strings to 2019-10-05 am: 84633edb22
am: b6ef08709f
am: 28a43e18c7
...
am: d9cdf3078b
Change-Id: Icad8e87d0404dbe75b16f12dcb6ad9e73334557f
2019-08-14 19:54:27 -07:00
Hsin-Yi Chen
c5a074798f
Merge "Add tags to lsdump_paths.txt" am: 7205361315
...
am: a489b755a0
Change-Id: Iff9f0a21911dcd0478e93eab5452f0d6263af990
2019-08-14 19:54:10 -07:00
Paul Scovanner
cb6234b6df
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 36c17b8465
...
am: 1e15d33232
Change-Id: Ic80af5f8665685d74fd50ef5de31aa6607aed4f0
2019-08-14 19:53:58 -07:00
Paul Scovanner
3250cbd459
[DO NOT MERGE] Update Security Strings to 2019-10-01
...
Bug:139434268
Change-Id: Ie9e36ac0ace5c67468391650ad2fa1fa02941f6e
2019-08-15 02:52:20 +00:00
Paul Scovanner
61dfcf7964
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 5140669795
...
am: 0cafcd40dc
Change-Id: Ib492f372e055aac8757bb3a3ebb6ea9c65890e91
2019-08-14 19:46:32 -07:00
Android Build Merger (Role)
bbe3ffa293
Merge "Merge "Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2" into qt-r1-dev-plus-aosp am: 2021b3bc8e" into qt-qpr1-dev-plus-aosp
2019-08-15 02:45:53 +00:00
Paul Scovanner
dc467fbe14
Merge "Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2" into qt-r1-dev-plus-aosp
...
am: 2021b3bc8e
Change-Id: Idb70efa950f59e1b180b62a5e8aee03ea618dc6d
2019-08-14 19:45:42 -07:00
Paul Scovanner
268197b376
[automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa
-s ours am: 616d794540
am: 5140669795
...
am: d77b00d4d0
Change-Id: I7586037ca8c1f95870e285ab54ce2fdb4c4fcdf6
2019-08-14 19:45:41 -07:00
Android Build Merger (Role)
30114759cb
Merge "Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2
am: 50fa3d0d19" into qt-qpr1-dev-plus-aosp
2019-08-15 02:45:00 +00:00
Paul Scovanner
961a8e61d4
Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2
...
am: 50fa3d0d19
Change-Id: I8acb4cff9b8f1f802b0bd124572fa13e09e3e640
2019-08-14 19:44:48 -07:00