OSDN Git Service
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: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: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 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: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: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 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
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 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
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
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
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 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)
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
Ying Wang [Wed, 27 May 2015 22:32:41 +0000 (22:32 +0000)]
am
12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '
12f449756587b83cd6a04c793e05b837ceb41563':
Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Ying Wang [Wed, 27 May 2015 22:14:28 +0000 (15:14 -0700)]
Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
Ying Wang [Thu, 6 Nov 2014 22:11:33 +0000 (14:11 -0800)]
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Because we don't have 32-bit prebuilt libLLVM/libclang.
Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
(cherry picked from commit
e5d4e74f9f8c09b79cac8125fb58bdfbb4f1aa9c)
Ying Wang [Wed, 20 May 2015 00:39:27 +0000 (00:39 +0000)]
am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
247f5c4fce9e2cf1911458be1591517c1e7dbc42':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:28:37 +0000 (00:28 +0000)]
am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:11:27 +0000 (00:11 +0000)]
am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
e528e44d31498ad83482b1860036916d0fded379':
Add task to print transitive dependencies and their license files.
Ying Wang [Tue, 19 May 2015 23:58:46 +0000 (23:58 +0000)]
Merge "Add task to print transitive dependencies and their license files." into lmp-dev
Ying Wang [Thu, 7 May 2015 19:08:53 +0000 (12:08 -0700)]
Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
$ make deps-license packages/app/% external/%
prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".
Bug:
20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from
39b9b690a824c82465fe0ac9b44a0c1f5e6ae13a)
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:38:45 +0000 (00:38 +0000)]
am
90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
90ac39d2b56171b92f8d136fb8e35a63f8b70ff1':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:16:03 +0000 (00:16 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 22:37:39 +0000 (22:37 +0000)]
am
42321423: Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
* commit '
4232142313a582939d80209a1449f3e4a08f6701':
Doc change: increment metadata for updated Distribute landing page content.
Dirk Dougherty [Sat, 18 Apr 2015 22:19:10 +0000 (22:19 +0000)]
Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
Ryosuke Matsuuchi [Fri, 17 Apr 2015 01:30:30 +0000 (10:30 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
Dirk Dougherty [Thu, 16 Apr 2015 22:28:45 +0000 (15:28 -0700)]
Doc change: increment metadata for updated Distribute landing page content.
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
Joe Fernandez [Tue, 14 Apr 2015 17:13:10 +0000 (17:13 +0000)]
am
a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit '
a74d2efe8fbb131bc41650bce0deb92073dced46':
docs: add new style elements for Material Design cross-references
Joe Fernandez [Tue, 14 Apr 2015 16:54:49 +0000 (16:54 +0000)]
Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
Joe Fernandez [Thu, 2 Apr 2015 23:34:44 +0000 (16:34 -0700)]
docs: add new style elements for Material Design cross-references
Change-Id: I718cca684af36294aa89206f3845af5287d05bbe
Dirk Dougherty [Tue, 14 Apr 2015 04:33:24 +0000 (04:33 +0000)]
am
ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '
ffc357f098b9fb939d6869c0f2f1b70fb20c88b6':
Increment metadata files for new families pages.
Dirk Dougherty [Tue, 14 Apr 2015 04:14:26 +0000 (04:14 +0000)]
Merge "Increment metadata files for new families pages." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 01:30:39 +0000 (18:30 -0700)]
Increment metadata files for new families pages.
Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7
smain@google.com [Mon, 13 Apr 2015 20:53:34 +0000 (20:53 +0000)]
am
7c22c9a4: skeleton structure for NDK site
* commit '
7c22c9a45ceb44d5c7b4237b89e4227acd839374':
skeleton structure for NDK site
smain@google.com [Sat, 11 Apr 2015 03:38:47 +0000 (20:38 -0700)]
skeleton structure for NDK site
Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497
David Friedman [Sat, 11 Apr 2015 02:51:34 +0000 (02:51 +0000)]
am
cccdfc8a: Deleting or modifying files in new templates-ndk directory.
* commit '
cccdfc8a21134de2137e0f3cdc49bfc65601c944':
Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 01:27:57 +0000 (18:27 -0700)]
Deleting or modifying files in new templates-ndk directory.
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
David Friedman [Sat, 11 Apr 2015 01:34:51 +0000 (01:34 +0000)]
am
53b7c759: Cloned templates-sdk to create baseline for templates-ndk
* commit '
53b7c759ffaf80d87416a19ff2d3474e9fef52cb':
Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:34:50 +0000 (01:34 +0000)]
am
fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '
fd16d0930a5a6a74dce77c9a2da5707a6078d3f1':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
David Friedman [Sat, 11 Apr 2015 01:19:45 +0000 (18:19 -0700)]
Cloned templates-sdk to create baseline for templates-ndk
Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a
David Friedman [Sat, 11 Apr 2015 01:10:48 +0000 (01:10 +0000)]
am
84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
* commit '
84520abc75adda2e42e9e8d7365cfb41feca5268':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
David Friedman [Sat, 11 Apr 2015 01:07:39 +0000 (01:07 +0000)]
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
This reverts commit
84520abc75adda2e42e9e8d7365cfb41feca5268.
Change-Id: Id0734d134e424f1a101362781171371566f2ad7f
David Friedman [Fri, 10 Apr 2015 23:46:14 +0000 (16:46 -0700)]
Cloned sdk-templates directory to create an ndk-templates directory for
production use.
Change-Id: Icf205892d98f5a58350d140b0b0c56d0dceea111
Jeff Arneson [Fri, 27 Mar 2015 22:32:06 +0000 (15:32 -0700)]
Show annotation documentation on class details
Also fix a bug where showAnnotations tags weren't appearing on
symbols without a javadoc
Bug:
19427762
Bug:
19931569
Change-Id: I4de8d5682acc438da69637262d8447695d6fb975
Bart Sears [Fri, 27 Mar 2015 00:35:28 +0000 (00:35 +0000)]
am
1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
* commit '
1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
Ying Wang [Fri, 27 Mar 2015 00:33:25 +0000 (00:33 +0000)]
am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Bart Sears [Thu, 26 Mar 2015 04:04:38 +0000 (21:04 -0700)]
DO NOT MERGE - Bump version to 5.1.1
Bug:
19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug:
19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit
7d51a4029590b58e22071eed919d59a0ff205bef)
The Android Automerger [Sat, 21 Mar 2015 13:05:46 +0000 (06:05 -0700)]
"LKY80"
The Android Automerger [Sat, 21 Mar 2015 13:05:08 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Fri, 20 Mar 2015 13:06:23 +0000 (06:06 -0700)]
"LKY79"
The Android Automerger [Fri, 20 Mar 2015 13:05:07 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Thu, 19 Mar 2015 13:06:46 +0000 (06:06 -0700)]
"LKY78"
The Android Automerger [Thu, 19 Mar 2015 13:05:10 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Justin Morey [Thu, 19 Mar 2015 02:47:00 +0000 (02:47 +0000)]
am
030b5493: resolved conflicts for merge of
68000907 to lmp-mr1-dev
* commit '
030b5493147d47a726e9f3e0e474772b29ad3111':
Bump generic_x86_64 system partition size - DO NOT MERGE
Justin Morey [Thu, 19 Mar 2015 02:27:17 +0000 (21:27 -0500)]
resolved conflicts for merge of
68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
Justin Morey [Wed, 18 Mar 2015 23:00:33 +0000 (23:00 +0000)]
am
02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '
02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
Bump generic_x86_64 system partition size - DO NOT MERGE
Justin Morey [Wed, 18 Mar 2015 19:57:16 +0000 (14:57 -0500)]
Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build
Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
The Android Automerger [Wed, 18 Mar 2015 13:06:27 +0000 (06:06 -0700)]
"LKY77"
The Android Automerger [Wed, 18 Mar 2015 13:05:20 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 17 Mar 2015 13:06:41 +0000 (06:06 -0700)]
"LKY76"
The Android Automerger [Tue, 17 Mar 2015 13:05:08 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 16 Mar 2015 13:05:29 +0000 (06:05 -0700)]
"LKY75"
The Android Automerger [Mon, 16 Mar 2015 13:05:10 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 14 Mar 2015 13:06:04 +0000 (06:06 -0700)]
"LKY73"
The Android Automerger [Sat, 14 Mar 2015 13:05:13 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Sat, 14 Mar 2015 00:17:52 +0000 (00:17 +0000)]
am
ae61f50a: Support to configure and build multiple custom images.
* commit '
ae61f50a680d4a8e91274b35305dc2e24959abbe':
Support to configure and build multiple custom images.
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug:
19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit
5fcf1094f9cf4d57c2598237f99621f254130d71)
The Android Automerger [Fri, 13 Mar 2015 13:07:04 +0000 (06:07 -0700)]
"LKY72"
The Android Automerger [Fri, 13 Mar 2015 13:06:04 +0000 (06:06 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Tao Bao [Thu, 12 Mar 2015 22:56:28 +0000 (22:56 +0000)]
am
daebaa6e: Restrict the verification in block-based incremental OTAs
* commit '
daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
Restrict the verification in block-based incremental OTAs
Tao Bao [Thu, 12 Mar 2015 19:32:37 +0000 (12:32 -0700)]
Restrict the verification in block-based incremental OTAs
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.
Change-Id: I3a776495b69e1d174fcb01b10e40c0e912914fd8
The Android Automerger [Thu, 12 Mar 2015 13:06:47 +0000 (06:06 -0700)]
"LKY71"
The Android Automerger [Thu, 12 Mar 2015 13:05:20 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 11 Mar 2015 13:05:53 +0000 (06:05 -0700)]
"LKY70"