OSDN Git Service
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours
am:
d28e7ea333 -s ours
* commit '
d28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am:
f193546d65 -s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4
am:
0ca3757
* commit '
0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]
Update security patch string to 2016-06-01
am:
0a3b3d4
* commit '
0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]
Update security patch string to 2016-06-01
b/
28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780
am:
274e483
* commit '
274e48378f92c711d28876380f34e263159cb81b':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am:
175b780
* commit '
175b7800f484edceee404abf21973859d5793c0d':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5
am:
df28b90
* commit '
df28b90a7c45a02c4ba9896ad89f745a48fac7df':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am:
2b71be5
* commit '
2b71be536b6de0d16d0ae3224d1b00c41bec467e':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/
27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
Zach Jang [Fri, 18 Mar 2016 00:13:25 +0000 (00:13 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba
am:
cdbccfd
* commit '
cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
Zach Jang [Fri, 18 Mar 2016 00:10:53 +0000 (00:10 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am:
7a498ba
* commit '
7a498bafff136f1996042c6794ababcaff11d600':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:04:32 +0000 (17:04 -0700)]
Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2
b/
27724091
Change-Id: If448a426d78388208e15254ef30b42873a729647
Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c
am:
054bbb9766
* commit '
054bbb9766312a2caefd5375341d49074a6d25bf':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]
Updating security string patch to 2016-04-01
am:
e182d2a95c
* commit '
e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01
b/
27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
Zach Jang [Tue, 12 Jan 2016 01:26:41 +0000 (01:26 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d
am:
293887c43e
* commit '
293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:24:55 +0000 (01:24 +0000)]
Updating security patch string to 2016-03-01
am:
c24c6ccd4d
* commit '
c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01
b/
26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b
am:
af970fb308
* commit '
af970fb308dd7914e8dccb56e8ea08d50e92e617':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
am:
929a4abd2b
* commit '
929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:45:57 +0000 (14:45 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
b/
26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad
am:
645f200ae8
* commit '
645f200ae8708414d06618989328dc3e3c84a917':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE
am:
58cdbdc5ad
* commit '
58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Fri, 20 Nov 2015 22:32:09 +0000 (14:32 -0800)]
Update Security String to 2016-01-01 - DO NOT MERGE
http://b/
25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]
Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
Zach Jang [Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)]
am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
0961150929c775a439f31b8c4fb35ba6a03c6f08':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)]
resolved conflicts for
b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
Zach Jang [Mon, 21 Sep 2015 19:05:35 +0000 (19:05 +0000)]
am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
63712481f04b6525288b5df182d6f3e853a3bfb9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 19:05:33 +0000 (19:05 +0000)]
am
ab095b44: am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
ab095b445af361911df2856e77f43c4cf103a0e2':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:22 +0000 (18:58 +0000)]
am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
bb97ff5941b266639e31fd4a30a6d34921e7bc2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:10 +0000 (18:58 +0000)]
am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:40:28 +0000 (20:40 +0000)]
am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)]
am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
e539537d8c7a4288f40afa9226787b9af3d4416b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:16:43 +0000 (20:16 +0000)]
am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:17 +0000 (20:04 +0000)]
am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
leozwang [Tue, 15 Sep 2015 07:41:53 +0000 (00:41 -0700)]
Fix build.
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
Leo Wang [Tue, 15 Sep 2015 04:36:53 +0000 (04:36 +0000)]
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."
Leo Wang [Tue, 15 Sep 2015 04:29:45 +0000 (04:29 +0000)]
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."
Leo Wang [Tue, 15 Sep 2015 04:03:20 +0000 (04:03 +0000)]
Revert "Add an option to include a full bootloader in incremental OTA."
This reverts commit
46d5efcd0d451a48cc793931efef2b1ca982386d.
Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
leozwang [Mon, 14 Sep 2015 23:39:23 +0000 (16:39 -0700)]
resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
leozwang [Mon, 14 Sep 2015 21:27:04 +0000 (21:27 +0000)]
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.
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Bug:
23999213
Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]
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
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Tao Bao [Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)]
resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
Ying Wang [Tue, 25 Aug 2015 18:21:13 +0000 (18:21 +0000)]
am
fc028e59: Dist the otatools package.
* commit '
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
Konstantinos Menychtas [Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)]
resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
Doug Zongker [Tue, 25 Aug 2015 01:20:34 +0000 (01:20 +0000)]
am
32bf3f32: add otatools-package target
* commit '
32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
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
f22b0f43efbc16c548692dc239a387edda15d78f)
Konstantinos Menychtas [Tue, 18 Aug 2015 20:19:10 +0000 (20:19 +0000)]
am
dae79613: Increasing all emulator system image sizes
* commit '
dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 18 Aug 2015 17:27:04 +0000 (10:27 -0700)]
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
Tao Bao [Wed, 12 Aug 2015 06:19:06 +0000 (23:19 -0700)]
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
Tao Bao [Wed, 12 Aug 2015 05:18:37 +0000 (05:18 +0000)]
am
007979ee: Add support for clobbered blocks
* commit '
007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
Tao Bao [Tue, 12 May 2015 18:42:31 +0000 (11:42 -0700)]
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
ff7778166bd13a90c89fa333591ee2037f587a11)
George Mount [Mon, 27 Jul 2015 14:35:51 +0000 (14:35 +0000)]
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.
George Mount [Mon, 13 Jul 2015 23:44:44 +0000 (16:44 -0700)]
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Bug
22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
Dirk Dougherty [Wed, 8 Jul 2015 11:29:45 +0000 (11:29 +0000)]
am
aee6585c: Update js/css versions and add pt-br.
* commit '
aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
Dirk Dougherty [Wed, 8 Jul 2015 11:12:19 +0000 (04:12 -0700)]
Update js/css versions and add pt-br.
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
Dirk Dougherty [Wed, 8 Jul 2015 11:06:54 +0000 (11:06 +0000)]
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).
Chris Elliott [Thu, 2 Jul 2015 22:36:55 +0000 (22:36 +0000)]
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
Dirk Dougherty [Thu, 2 Jul 2015 21:21:55 +0000 (14:21 -0700)]
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
Chris Elliott [Thu, 2 Jul 2015 20:18:34 +0000 (20:18 +0000)]
Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
Tao Bao [Sun, 22 Mar 2015 21:20:48 +0000 (14:20 -0700)]
DO NOT MERGE Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.
Bug:
19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
Tao Bao [Thu, 2 Jul 2015 02:38:34 +0000 (19:38 -0700)]
Fix build.
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
Tao Bao [Thu, 2 Jul 2015 00:47:51 +0000 (00:47 +0000)]
am
1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '
1aa1af0e997699bc025e4f0a754692068328d7e6':
sparse_img.py: Don't write empty map groups.
Simon Wilson [Thu, 2 Jul 2015 00:47:50 +0000 (00:47 +0000)]
am
16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '
16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
Revert "sparse_img.py: Don't write empty map groups."
Tao Bao [Thu, 2 Jul 2015 00:44:53 +0000 (17:44 -0700)]
resolved conflicts for merge of
7f9470cd to lmp-mr1-ub-dev
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
Tao Bao [Sat, 27 Jun 2015 00:49:39 +0000 (17:49 -0700)]
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
Simon Wilson [Wed, 1 Jul 2015 18:10:28 +0000 (18:10 +0000)]
Revert "sparse_img.py: Don't write empty map groups."
This reverts commit
7f9470cda390ee61c0fc71491d0c649fbf6e02dd.
Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
Tao Bao [Sat, 27 Jun 2015 00:49:39 +0000 (17:49 -0700)]
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
Ying Wang [Fri, 26 Jun 2015 21:06:32 +0000 (14:06 -0700)]
Fix conflict resolving error in
ef5dc90bba179f774bee0c7e479965cef12091de
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
Mohamad Ayyash [Wed, 24 Jun 2015 23:54:12 +0000 (16:54 -0700)]
resolved conflicts for merge of
ef5dc90b to lmp-mr1-ub-dev
Mohamad Ayyash [Wed, 24 Jun 2015 22:42:19 +0000 (15:42 -0700)]
Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 24 Jun 2015 22:52:10 +0000 (22:52 +0000)]
am
648e40e8: build_image.py: Make sparse squashfs images
* commit '
648e40e8660135f37adad5981a48250476c2f3fd':
build_image.py: Make sparse squashfs images
Simon Wilson [Wed, 24 Jun 2015 22:42:27 +0000 (15:42 -0700)]
resolved conflicts for merge of
f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
Mohamad Ayyash [Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)]
resolved conflicts for merge of
1b748051 to lmp-mr1-ub-dev
Mohamad Ayyash [Wed, 24 Jun 2015 17:44:29 +0000 (10:44 -0700)]
build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Tue, 23 Jun 2015 23:22:32 +0000 (16:22 -0700)]
resolved conflicts for merge of
cade49dd to lmp-mr1-ub-dev
Simon Wilson [Wed, 17 Jun 2015 19:35:15 +0000 (12:35 -0700)]
Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
David Friedman [Wed, 17 Jun 2015 21:57:47 +0000 (21:57 +0000)]
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.
David Friedman [Wed, 17 Jun 2015 21:51:06 +0000 (21:51 +0000)]
Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
David Friedman [Wed, 17 Jun 2015 21:36:05 +0000 (14:36 -0700)]
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
Mohamad Ayyash [Fri, 1 May 2015 22:39:36 +0000 (15:39 -0700)]
common.py: Add support for squashfs
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Tue, 3 Mar 2015 20:30:37 +0000 (12:30 -0800)]
Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
C. Sean Young [Fri, 12 Jun 2015 16:29:25 +0000 (16:29 +0000)]
am
540772fa: am
cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '
540772fa2287e63a0c745229fb72b78903c9cd70':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
C. Sean Young [Wed, 10 Jun 2015 18:38:46 +0000 (18:38 +0000)]
am
cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '
cf4699895ad99b83a24e376007750e2c2c0502f6':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
C. Sean Young [Tue, 9 Jun 2015 17:35:45 +0000 (12:35 -0500)]
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.
Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
Luan Nguyen [Wed, 3 Jun 2015 18:25:23 +0000 (18:25 +0000)]
am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
95a1818f50c685f903635ae84076199015cc9c78':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Wed, 3 Jun 2015 18:13:16 +0000 (18:13 +0000)]
Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs