Leo Wang
1c1a6d15b2
am 2c9dfb82
: am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:36:53 +00:00
Leo Wang
2c9dfb8239
am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '1d4ad5158b2cf2f30269d8f733548188208af64a':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:29:45 +00:00
Leo Wang
1d4ad5158b
Revert "Add an option to include a full bootloader in incremental OTA."
...
This reverts commit 46d5efcd0d
.
Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
2015-09-15 04:03:20 +00:00
leozwang
1753b4e9e4
resolved conflicts for 00fdede3
to lmp-mr1-ub-dev
...
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
2015-09-14 16:39:23 -07:00
leozwang
00fdede320
am 46d5efcd
: Add an option to include a full bootloader in incremental OTA.
...
* commit '46d5efcd0d451a48cc793931efef2b1ca982386d':
Add an option to include a full bootloader in incremental OTA.
2015-09-14 21:27:04 +00:00
leozwang
46d5efcd0d
Add an option to include a full bootloader in incremental OTA.
...
Bug: 23101469
Bug: 23999213
Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
2015-09-14 10:41:34 -07:00
Ying Wang
fc168f8469
resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
2015-08-26 17:03:18 -07:00
Ying Wang
1e120181f0
am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
2015-08-26 20:17:16 +00:00
Claes Elgemark
1a8c656704
am 8d771971
: Don\'t fail build of otatools if there are no device certificates
...
* commit '8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121
Don't fail build of otatools if there are no device certificates
...
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Tao Bao
c6e087adc4
resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
2015-08-25 16:18:01 -07:00
Ying Wang
473b6a5f2b
am fc028e59
: Dist the otatools package.
...
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Konstantinos Menychtas
e9a8f46585
resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
2015-08-25 17:26:22 +00:00
Doug Zongker
2bcfbe7e88
am 32bf3f32
: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Doug Zongker
32bf3f3265
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef
)
2015-08-24 15:43:40 -07:00
Konstantinos Menychtas
0287a8f6c5
am dae79613
: Increasing all emulator system image sizes
...
* commit 'dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
2015-08-18 20:19:10 +00:00
Konstantinos Menychtas
dae79613cb
Increasing all emulator system image sizes
...
Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.
All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).
Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
2015-08-18 11:18:59 -07:00
Tao Bao
1dca55fde5
skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
The change (007979ee
) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao
67e7c66124
am 007979ee
: Add support for clobbered blocks
...
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75
Add support for clobbered blocks
...
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b
)
2015-08-11 21:02:45 -07:00
George Mount
56f7b77520
am a5841355
: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit 'a58413554455248dcaea3ad1c022316c1e3288e7':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 14:35:51 +00:00
George Mount
a584135544
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
Bug 22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
2015-07-20 16:48:58 -07:00
Dirk Dougherty
0da02191cc
am aee6585c
: Update js/css versions and add pt-br.
...
* commit 'aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
2015-07-08 11:29:45 +00:00
Dirk Dougherty
aee6585c32
Update js/css versions and add pt-br.
...
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
2015-07-08 04:12:19 -07:00
Dirk Dougherty
4187cee61b
am 0b9e204d
: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
* commit '0b9e204df09d9630db24f61bb427110501df6743':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:06:54 +00:00
Chris Elliott
a0cca8e66a
am 1e253e76
: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit '1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:36:55 +00:00
Dirk Dougherty
0b9e204df0
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
2015-07-02 14:21:55 -07:00
Chris Elliott
1e253e76b9
Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce
DO NOT MERGE Fix the syntax error in the edify script generator
...
file_getprop() always expects two arguments.
Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-07-02 13:17:21 -07:00
Tao Bao
41bcf3e425
Fix build.
...
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
2015-07-01 19:38:34 -07:00
Tao Bao
608d9d2452
am 1aa1af0e
: sparse_img.py: Don\'t write empty map groups.
...
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
sparse_img.py: Don't write empty map groups.
2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a
am 16401ad4
: Revert "sparse_img.py: Don\'t write empty map groups."
...
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
Revert "sparse_img.py: Don't write empty map groups."
2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e
resolved conflicts for merge of 7f9470cd
to lmp-mr1-ub-dev
...
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99
sparse_img.py: Don't write empty map groups.
...
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.
Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425
Revert "sparse_img.py: Don't write empty map groups."
...
This reverts commit 7f9470cda3
.
Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3
sparse_img.py: Don't write empty map groups.
...
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.
Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
2015-07-01 10:10:31 -07:00
Ying Wang
78d1cba0f4
Fix conflict resolving error in ef5dc90bba
...
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Mohamad Ayyash
1a4658cd3b
resolved conflicts for merge of ef5dc90b
to lmp-mr1-ub-dev
2015-06-24 16:54:12 -07:00
Mohamad Ayyash
ef5dc90bba
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Mohamad Ayyash
48cb24a655
am 648e40e8
: build_image.py: Make sparse squashfs images
...
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Simon Wilson
ecfc97f772
resolved conflicts for merge of f86e7eea
to lmp-mr1-ub-dev
...
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash
9ca7fa8993
resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
2015-06-24 15:04:38 -07:00
Mohamad Ayyash
648e40e866
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
f35ed6bd84
resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
2015-06-23 16:22:32 -07:00
Simon Wilson
f86e7eeabc
Add compressor options for squashfs system images
...
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
David Friedman
552de126e9
am 42c75239
: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
...
* commit '42c752392ceea6854c423339eedede6f4fdf6696':
Docs: Fixing disappearance of the left-navs in NDK minisite.
2015-06-17 21:57:47 +00:00
David Friedman
42c752392c
Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
2015-06-17 21:51:07 +00:00
David Friedman
c997cf910b
Docs: Fixing disappearance of the left-navs in NDK minisite.
...
When the filepath changed from html-ndk/ndk/ to html/ndk, the build
system could no longer find the _toc files. This change fixes that issue.
Change-Id: I51f19159e6636fb90ed04013b11d7f95fb4e04c3
2015-06-17 14:36:05 -07:00
Mohamad Ayyash
1b748051dd
common.py: Add support for squashfs
...
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:18:44 -07:00