Zach Jang
0961150929
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
2015-09-21 19:05:35 +00:00
Zach Jang
b161297d4b
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
2015-09-21 19:05:33 +00:00
Zach Jang
63712481f0
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
2015-09-21 18:58:22 +00:00
Zach Jang
ab095b445a
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
2015-09-21 18:58:10 +00:00
Zach Jang
bb97ff5941
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
2015-09-17 20:40:28 +00:00
Zach Jang
a7168e1c6e
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
2015-09-17 20:27:20 +00:00
Zach Jang
e539537d8c
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
2015-09-17 20:16:43 +00:00
Zach Jang
7f96f4f6b9
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
2015-09-17 20:04:23 +00:00
Zach Jang
48e2b43e8c
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
2015-09-17 20:04:17 +00:00
Zach Jang
47ef4c3467
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
...
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Zach Jang
4c710cbe7f
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
...
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:21:39 +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
2015-09-15 04:03:20 +00: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
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
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
2015-08-25 11:13:56 -07: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
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
C. Sean Young
cf4699895a
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
2015-06-10 13:00:13 -05:00
Ying Wang
58b3ee2863
am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
...
* commit '12f449756587b83cd6a04c793e05b837ceb41563':
Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:32:41 +00:00
Ying Wang
12f4497565
Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
...
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07:00
Ying Wang
a6ffb929f4
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 e5d4e74f9f
2015-05-19 22:34:40 -07:00
Ying Wang
bf6b82fbf1
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.
2015-05-20 00:39:27 +00:00
Ying Wang
247f5c4fce
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.
2015-05-20 00:28:37 +00:00
Ying Wang
1bd155692f
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.
2015-05-20 00:11:27 +00:00
Ying Wang
e528e44d31
Merge "Add task to print transitive dependencies and their license files." into lmp-dev
2015-05-19 23:58:47 +00:00
Ying Wang
a1ea202256
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 39b9b690a8
2015-05-19 16:37:42 -07:00
Ryosuke Matsuuchi
f98bdce10b
am 90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '90ac39d2b56171b92f8d136fb8e35a63f8b70ff1':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:38:45 +00:00
Ryosuke Matsuuchi
90ac39d2b5
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
2015-04-19 00:16:05 +00:00
Dirk Dougherty
e8ee99188d
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.
2015-04-18 22:37:39 +00:00
Dirk Dougherty
4232142313
Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
2015-04-18 22:19:10 +00:00
Ryosuke Matsuuchi
25799ca584
doc: Add Korean version of DAC/distribute/ page.
...
Bug: 20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
2015-04-17 12:15:38 +09:00
Dirk Dougherty
aa9fbd8232
Doc change: increment metadata for updated Distribute landing page content.
...
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
2015-04-16 15:28:45 -07:00
Joe Fernandez
b0ff62a181
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
2015-04-14 17:13:10 +00:00
Joe Fernandez
a74d2efe8f
Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
2015-04-14 16:54:49 +00:00
Joe Fernandez
a5863928c2
docs: add new style elements for Material Design cross-references
...
Change-Id: I718cca684af36294aa89206f3845af5287d05bbe
2015-04-13 21:59:56 -07:00
Dirk Dougherty
9317e40807
am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
...
* commit 'ffc357f098b9fb939d6869c0f2f1b70fb20c88b6':
Increment metadata files for new families pages.
2015-04-14 04:33:24 +00:00
Dirk Dougherty
ffc357f098
Merge "Increment metadata files for new families pages." into lmp-docs
2015-04-14 04:14:27 +00:00
Dirk Dougherty
26b600676b
Increment metadata files for new families pages.
...
Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7
2015-04-13 18:30:39 -07:00
smain@google.com
def19e7974
am 7c22c9a4: skeleton structure for NDK site
...
* commit '7c22c9a45ceb44d5c7b4237b89e4227acd839374':
skeleton structure for NDK site
2015-04-13 20:53:34 +00:00
smain@google.com
7c22c9a45c
skeleton structure for NDK site
...
Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497
2015-04-13 13:30:47 -07:00
David Friedman
f69594b164
am cccdfc8a: Deleting or modifying files in new templates-ndk directory.
...
* commit 'cccdfc8a21134de2137e0f3cdc49bfc65601c944':
Deleting or modifying files in new templates-ndk directory.
2015-04-11 02:51:34 +00:00
David Friedman
cccdfc8a21
Deleting or modifying files in new templates-ndk directory.
...
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
2015-04-10 18:35:11 -07:00
