Chih-Hung Hsieh
32031f6aa4
Merge "Accept alternative email addresses." am: 0b14739e0f am: 6dfe4bc16a
...
am: 7f11838211
2017-09-07 22:42:09 +00:00
Chih-Hung Hsieh
7f11838211
Merge "Accept alternative email addresses." am: 0b14739e0f
...
am: 6dfe4bc16a
2017-09-07 22:37:09 +00:00
Chih-Hung Hsieh
6dfe4bc16a
Merge "Accept alternative email addresses."
...
am: 0b14739e0f
2017-09-07 22:32:09 +00:00
Treehugger Robot
0b14739e0f
Merge "Accept alternative email addresses."
2017-09-07 22:16:25 +00:00
Chih-Hung Hsieh
2b1efe63cf
Accept alternative email addresses.
...
Some OWNERS files use secondary email addresses, so we only
check existence of _account_id and email attributes.
Test: run against existing OWNERS files
Change-Id: I6f0804a8a90b7a23783c3fe45686d4d973876ed1
2017-09-07 13:07:26 -07:00
Tao Bao
64e506778d
Merge "Skip checking files that have less blocks in block map." am: aa599f3916 am: 6b8eeb0bf4
...
am: ff5c236e34
2017-09-07 18:00:50 +00:00
Tao Bao
ff5c236e34
Merge "Skip checking files that have less blocks in block map." am: aa599f3916
...
am: 6b8eeb0bf4
2017-09-07 17:58:50 +00:00
Tao Bao
6b8eeb0bf4
Merge "Skip checking files that have less blocks in block map."
...
am: aa599f3916
2017-09-07 17:56:50 +00:00
Tao Bao
aa599f3916
Merge "Skip checking files that have less blocks in block map."
2017-09-07 17:50:51 +00:00
SzuWei Lin
981a41ed2b
Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev
...
am: 4ee9bb6caa
2017-09-07 15:08:07 +00:00
SzuWei Lin
980eb21f47
Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev
...
am: 032adc13c9
2017-09-07 15:00:53 +00:00
TreeHugger Robot
4ee9bb6caa
Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev
2017-09-07 14:59:43 +00:00
Ian Pedowitz
21873fbd4f
Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
...
am: 418b291486
2017-09-07 14:50:05 +00:00
Adam Seaton
d09059851c
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6 am: f84b592ed3
...
am: 99dd08dfdd
2017-09-07 14:48:44 +00:00
TreeHugger Robot
032adc13c9
Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev
2017-09-07 02:50:17 +00:00
Sundong Ahn
11b95f1197
Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp
...
am: e8d229c70f
2017-09-07 01:24:04 +00:00
Sundong Ahn
fa8a5d914e
configstore: remove configstore 1.1
...
am: 43e711962e
2017-09-07 01:14:39 +00:00
TreeHugger Robot
e8d229c70f
Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp
2017-09-07 01:09:31 +00:00
Adam Seaton
cb72cda511
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6 am: f84b592ed3
...
am: 9afe3d5af4
2017-09-06 23:51:54 +00:00
TreeHugger Robot
418b291486
Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
2017-09-06 23:46:48 +00:00
Adam Seaton
99dd08dfdd
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6
...
am: f84b592ed3
2017-09-06 23:43:30 +00:00
Adam Seaton
9afe3d5af4
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6
...
am: f84b592ed3
2017-09-06 23:43:30 +00:00
Adam Seaton
f84b592ed3
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours
...
am: 181a73eeb6
2017-09-06 23:39:24 +00:00
Adam Seaton
181a73eeb6
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3
...
am: 77d8b88c61
2017-09-06 23:35:23 +00:00
Adam Seaton
77d8b88c61
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc
...
am: abf1d733f3
2017-09-06 23:31:23 +00:00
Adam Seaton
abf1d733f3
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f
...
am: 6613b4e6fc
2017-09-06 23:27:25 +00:00
Adam Seaton
6613b4e6fc
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a
...
am: e522ce436f
2017-09-06 23:22:54 +00:00
Adam Seaton
e522ce436f
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours
...
am: 137d5f095a
2017-09-06 23:18:54 +00:00
Adam Seaton
137d5f095a
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25
...
am: fbd8bcf329
2017-09-06 23:14:52 +00:00
Adam Seaton
fbd8bcf329
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749
...
am: 40720f6a25
2017-09-06 23:10:23 +00:00
Adam Seaton
40720f6a25
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
...
am: bf38f45749
2017-09-06 23:05:23 +00:00
Adam Seaton
bf38f45749
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
...
am: 84557be29b
2017-09-06 23:00:22 +00:00
Adam Seaton
84557be29b
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
2017-09-06 22:44:40 +00:00
Tao Bao
28bec43b96
Merge "releasetools: Validate A/B OTA payload signatures." am: 631b3a031c am: d5ec31f8a9
...
am: 9e8416917a
2017-09-06 21:15:46 +00:00
Tao Bao
9e8416917a
Merge "releasetools: Validate A/B OTA payload signatures." am: 631b3a031c
...
am: d5ec31f8a9
2017-09-06 21:07:46 +00:00
Tao Bao
d5ec31f8a9
Merge "releasetools: Validate A/B OTA payload signatures."
...
am: 631b3a031c
2017-09-06 20:48:14 +00:00
Tao Bao
631b3a031c
Merge "releasetools: Validate A/B OTA payload signatures."
2017-09-06 20:35:07 +00:00
Ian Pedowitz
62a835d0ef
DO NOT MERGE OC-MR1 is REL
...
Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
2017-09-06 13:12:42 -07:00
Michael Schwartz
dcfe8aa775
Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev
...
am: c5027d6e7d
2017-09-06 16:58:37 +00:00
Michael Schwartz
c5027d6e7d
Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev
2017-09-06 16:47:32 +00:00
SzuWei Lin
558f3dd79b
Revise GSI to inherit from aosp_base.mk and telephony.mk
...
GSI inherited from aosp_base_telephony.mk, but it included some settings for
emulator. So this patch changes to inherit from more pure makefiles to
includes AOSP and telephony modules.
Bug: 65332895
Test: Test on some Pixel devices with GSI, boot to home screen
Change-Id: I98523e864ccf06ddba4422bc8380bc6ff0095d5a
2017-09-06 17:05:08 +08:00
Bowgo Tsai
6bbb11a620
Include vbmeta.img into <product>-img.zip
...
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
2017-09-06 09:30:32 +08:00
Tao Bao
b418c30e3a
Skip checking files that have less blocks in block map.
...
When creating ext4 images with mke2fs, it may skip allocating some
blocks if they contain all zeros. As a result, there could be less
blocks listed in the block map than the actual file length.
For example, for a file with a length of 112200-byte (27+ blocks),
the listed blocks in block.map could be '43665-43688' (24 blocks).
Because some all-zero blocks are not taking actual space.
The generated ext4 images are perfectly valid - kernel will figure out
that data block is not allocated and writes all zeros into user buffer.
However, we can't fully reconstruct a file from its block list in our
Python script. Ideally this can be avoided by mounting or parsing an
ext4 image directly, which is yet to be supported in our script.
This CL skips checking for such files to avoid failing
validate_target_files.py.
Bug: 65213616
Test: validate_target_files.py passes on targets with mke2fs generated
images (e.g. marlin).
Change-Id: Id9cc59e345b9283844044ef94ceb5702f0ca0526
2017-09-05 15:53:24 -07:00
Steven Moreland
cb373600f2
Merge "Update compatibility matrix logic." into oc-mr1-dev
...
am: d7314b90bd
2017-09-05 21:14:30 +00:00
TreeHugger Robot
d7314b90bd
Merge "Update compatibility matrix logic." into oc-mr1-dev
2017-09-05 20:54:27 +00:00
Mathieu Chartier
929b08ccbe
Merge "Fix boot image profile in make files" am: 71f622e247 am: c48a5c0a31
...
am: 26bd213b8c
2017-09-05 17:43:40 +00:00
Mathieu Chartier
26bd213b8c
Merge "Fix boot image profile in make files" am: 71f622e247
...
am: c48a5c0a31
2017-09-05 17:34:30 +00:00
Mathieu Chartier
c48a5c0a31
Merge "Fix boot image profile in make files"
...
am: 71f622e247
2017-09-05 17:26:32 +00:00
Mathieu Chartier
71f622e247
Merge "Fix boot image profile in make files"
2017-09-05 17:14:08 +00:00
SzuWei Lin
292b8433cb
Remove root folder bt_firmware in GSI
...
Bug: 64905218
Bug: 36764215
Test: Test on 2 different devices with GSI, and check BT
Change-Id: I5fca470aece7d4b777540da21af601a7cc8dc83e
2017-09-05 11:12:29 +08:00
