Commit graph

19746 commits

Author SHA1 Message Date
Zach Jang
6575d4a2a8 Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07: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
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
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
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
fc028e59c2 Dist the otatools package.
Bug: 23495952

(cherry picked from commit 267e957373)

Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07: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
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
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
Ying Wang
12f4497565 Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07: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
90ac39d2b5 Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 2015-04-19 00:16:05 +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
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
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
7c22c9a45c skeleton structure for NDK site
Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497
2015-04-13 13:30:47 -07:00
David Friedman
cccdfc8a21 Deleting or modifying files in new templates-ndk directory.
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
2015-04-10 18:35:11 -07:00
David Friedman
53b7c759ff Cloned templates-sdk to create baseline for templates-ndk
Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a
2015-04-10 18:19:45 -07:00
David Friedman
fd16d0930a Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
This reverts commit 84520abc75.

Change-Id: Id0734d134e424f1a101362781171371566f2ad7f
2015-04-11 01:07:39 +00:00
David Friedman
84520abc75 Cloned sdk-templates directory to create an ndk-templates directory for
production use.

Change-Id: Icf205892d98f5a58350d140b0b0c56d0dceea111
2015-04-10 17:48:12 -07:00
Bart Sears
1c3bf5c39d DO NOT MERGE - Bump version to 5.1.1
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
Ying Wang
ad54a4dab5 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 7d51a40295)
2015-03-23 17:50:16 +00:00
Justin Morey
030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05:00
Justin Morey
68000907e3 am 02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-18 23:00:33 +00:00
Justin Morey
02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
2015-03-18 21:04:14 +00:00
Ying Wang
ae61f50a68 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 5fcf1094f9)
2015-03-14 00:06:54 +00:00
Tao Bao
daebaa6ed3 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
2015-03-12 13:47:04 -07:00
Ryosuke Matsuuchi
3c242c5ddb am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '4b2537f39d7ac29258908e1a38ebdf085fd44c5f':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:42:54 +00:00
Ryosuke Matsuuchi
4b2537f39d am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit 'e34b4ec484faf5dac8286bb17bedeed0e83a6962':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:38:38 +00:00
Ryosuke Matsuuchi
e34b4ec484 am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '2b486dc8c3af8cb82f49933356d1d49ad48da619':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:33:43 +00:00
Ryosuke Matsuuchi
2b486dc8c3 Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 2015-02-27 07:58:58 +00:00
Ying Wang
a6d5250ae1 am 41e3685f: am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '41e3685f97d4b8034034c89676e88f7a7caa47c2':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2015-02-26 23:28:21 +00:00
Ying Wang
41e3685f97 am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit 'bf565365debd77424dbcf0877089f6f33100d8db':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2015-02-26 23:15:32 +00:00
Ying Wang
bf565365de Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.

Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
(cherry picked from commit 0e36bfeb3f)
2015-02-26 22:18:18 +00:00
Ying Wang
0e36bfeb3f Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.

Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
2015-02-26 14:12:25 -08:00