21132c6173
am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit 'd5df2d949bb83b37f6cc7491a3b87dc4b29b7ff1':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 01:41:20 +00:00
b35ecf96a3
am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
...
* commit 'c005ee2518926c8f019048c9d6264061c2eb3994':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
2015-04-11 01:41:18 +00:00
cccdfc8a21
Deleting or modifying files in new templates-ndk directory.
...
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
2015-04-10 18:35:11 -07:00
d5df2d949b
am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit '53b7c759ffaf80d87416a19ff2d3474e9fef52cb':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 01:34:51 +00:00
c005ee2518
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."
2015-04-11 01:34:50 +00:00
3df0e22665
am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
...
* commit '188a2bab026237eebe9a773dd8fc287eb9a714be':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
2015-04-11 01:20:05 +00:00
53b7c759ff
Cloned templates-sdk to create baseline for templates-ndk
...
Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a
2015-04-10 18:19:45 -07:00
188a2bab02
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.
2015-04-11 01:10:48 +00:00
fd16d0930a
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
...
This reverts commit 84520abc75
2015-04-11 01:07:39 +00:00
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
05b3468b1e
am 6c46e0bf: Show annotation documentation on class details
...
* commit '6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48':
Show annotation documentation on class details
2015-04-01 16:33:27 +00:00
6c46e0bfe4
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
2015-03-31 19:11:41 +00:00
6d607ee7b0
am 1ded630d: am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
...
* commit '1ded630dec3ea9450c702d7250f0807af7c47cbb':
DO NOT MERGE - Bump version to 5.1.1
2015-03-27 00:43:41 +00:00
abba8a9117
am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit 'fcf0b1383999ce1da2ee9117884e31ca6620253b':
2015-03-27 00:43:40 +00:00
1ded630dec
am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
...
* commit '1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
2015-03-27 00:35:28 +00:00
fcf0b13839
am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
2015-03-27 00:33:25 +00:00
c319618638
am 91fbe4de: "LKY80"
...
* commit '91fbe4de4628cc993e8fe20d1cd4c84805ea61c7':
"LKY80"
2015-03-26 21:00:05 +00:00
a2ef9dd1f9
am 1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
...
* commit '1a10d739a79721ec8154a28884746ce472104777': (40 commits)
"LKY79"
"LKY78"
"LKY77"
"LKY76"
"LKY75"
"LKY73"
"LKY72"
"LKY71"
"LKY70"
"LKY69"
"LKY68"
"LKY66"
"LKY65"
"LKY64"
"LKY63"
"LKY62"
LKY61B
"LKY61"
"LKY59"
"LKY58"
...
2015-03-26 21:00:01 +00:00
1c3bf5c39d
DO NOT MERGE - Bump version to 5.1.1
...
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
743b9f498b
am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
2015-03-23 17:55:09 +00:00
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
91fbe4de46
"LKY80"
2015-03-21 06:05:46 -07:00
1a10d739a7
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-21 06:05:08 -07:00
d578fc0b95
"LKY79"
2015-03-20 06:06:23 -07:00
055db7a11b
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-20 06:05:07 -07:00
539a396b36
"LKY78"
2015-03-19 06:06:46 -07:00
b2e4aa67a2
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-19 06:05:10 -07:00
292427b69f
am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
...
* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-19 02:47:00 +00:00
030b549314
resolved conflicts for merge of 68000907 to lmp-mr1-dev
...
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05:00
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
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
4568ab2e05
"LKY77"
2015-03-18 06:06:27 -07:00
2dca75ddb3
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-18 06:05:20 -07:00
dbf0141086
"LKY76"
2015-03-17 06:06:41 -07:00
8bc6dbdd84
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-17 06:05:08 -07:00
db175c8840
"LKY75"
2015-03-16 06:05:29 -07:00
28f56280e7
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-16 06:05:10 -07:00
56a3b76aeb
"LKY73"
2015-03-14 06:06:04 -07:00
e6e579636e
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-14 06:05:13 -07:00
4cbc4b392d
am ae61f50a: Support to configure and build multiple custom images.
...
* commit 'ae61f50a680d4a8e91274b35305dc2e24959abbe':
Support to configure and build multiple custom images.
2015-03-14 00:17:52 +00:00
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
d5b7ed68ba
"LKY72"
2015-03-13 06:07:04 -07:00
5aebde3caf
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-13 06:06:04 -07:00
ae524f60bc
am daebaa6e: Restrict the verification in block-based incremental OTAs
...
* commit 'daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
Restrict the verification in block-based incremental OTAs
2015-03-12 22:56:28 +00:00
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
44500cf3c7
"LKY71"
2015-03-12 06:06:47 -07:00
9bae5788d2
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-12 06:05:20 -07:00
f2ad552790
"LKY70"
2015-03-11 06:05:53 -07:00
76ea80887e
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-11 06:05:11 -07:00
1ec82b70f5
"LKY69"
2015-03-10 06:06:38 -07:00
David Friedman