26b600676b
Increment metadata files for new families pages.
...
Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7
2015-04-13 18:30:39 -07:00
def19e7974
am 7c22c9a4: skeleton structure for NDK site
...
* commit '7c22c9a45ceb44d5c7b4237b89e4227acd839374':
skeleton structure for NDK site
2015-04-13 20:53:34 +00:00
7c22c9a45c
skeleton structure for NDK site
...
Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497
2015-04-13 13:30:47 -07:00
2c08a82db9
am 0a4bfe82: am bc8bb112: am f69594b1: am cccdfc8a: Deleting or modifying files in new templates-ndk directory.
...
* commit '0a4bfe82c3902a16adaca23746e4bee7d9f70cfa':
Deleting or modifying files in new templates-ndk directory.
2015-04-11 03:31:43 +00:00
0a4bfe82c3
am bc8bb112: am f69594b1: am cccdfc8a: Deleting or modifying files in new templates-ndk directory.
...
* commit 'bc8bb112edfd949fb44f7511d40e5afcc5a6ec14':
Deleting or modifying files in new templates-ndk directory.
2015-04-11 03:11:26 +00:00
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
4753830c44
am 503363c6: am 21132c61: am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit '503363c60d87be1cd816f582d823e57ddd2b149b':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 02:12:07 +00:00
3ce7fde6b8
am 7dc6d60b: am b35ecf96: am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
...
* commit '7dc6d60b46184e307f87643fbb100350171f13dd':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
2015-04-11 02:12:06 +00:00
a00096ae8e
am 8441c1d4: am 3df0e226: am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
...
* commit '8441c1d444ebb468d63fec6b7562e7399d32aea6':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
2015-04-11 01:56:29 +00:00
503363c60d
am 21132c61: am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit '21132c6173753c94437dee0eb9e6c39638889009':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 01:50:57 +00:00
7dc6d60b46
am b35ecf96: am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
...
* commit 'b35ecf96a37ac31d04032836fc09d4f2c85a7e64':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
2015-04-11 01:50:56 +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
8441c1d444
am 3df0e226: am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
...
* commit '3df0e2266584ad73ee2fc02e75051c1ae7ee480c':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
2015-04-11 01:29:53 +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
e18196095b
Merge "Separate boot and recovery image signing from dm-verity"
2015-04-10 09:44:47 +00:00
915e47aad5
am 948f67b0: am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
...
* commit '948f67b0e7b3863488fd4a12a6797311d4c30508':
Dump fingerprints into recovery log
2015-04-10 04:35:11 +00:00
948f67b0e7
am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
...
* commit 'd0ca05493bfe06cf166e4e215cd9bf38936fb344':
Dump fingerprints into recovery log
2015-04-10 02:23:31 +00:00
6c55a8adc8
Dump fingerprints into recovery log
...
No more guessing. We should have the info for OTA issues diagnosis.
Change-Id: I0ce919434444ab16a38cc7af818e64785509b0fb
2015-04-09 17:36:05 -07:00
8b3f08bc7b
Separate boot and recovery image signing from dm-verity
...
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.
Bug: 19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
2015-04-08 12:30:16 +01:00
4605be6c9e
am e2925213: am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071
...
* commit 'e2925213a73033451cd30dae620a0ce1abbc3a24':
fs_get_stats: add logging
fs_config: add logging
2015-04-07 17:20:33 +00:00
e2925213a7
am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071
...
* commit 'bf2474fba4dc446b4b580f4122d172e011c24ba1':
fs_get_stats: add logging
fs_config: add logging
2015-04-07 16:58:02 +00:00
27ac7a9c1a
fs_get_stats: add logging
...
libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I75d472ed142e32959cec78bf7babbf39d2b66cd2
2015-04-07 09:19:27 -07:00
5f478fe3c5
fs_config: add logging
...
libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I6d68107156962a6fec357ab99d23960c6852b026
2015-04-07 09:18:30 -07:00
16109f6c38
am f45cdea2: am 496c4eb6: am 6ac0d474: Merge "fs_config: move fs_config to libcutils"
...
* commit 'f45cdea226806c1ca386fc8a4d5029871410696d':
fs_config: move fs_config to libcutils
2015-04-02 21:40:12 +00:00
5131bf7a7d
am 25b2fd5b: am 47437817: am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
...
* commit '25b2fd5b4ad128a8ddb661e736f714ce3f651c33':
fs_get_stats: move fs_config to libcutils
2015-04-02 21:40:10 +00:00
f45cdea226
am 496c4eb6: am 6ac0d474: Merge "fs_config: move fs_config to libcutils"
...
* commit '496c4eb6a3db26ce307eff2d9be090e1c85f8639':
fs_config: move fs_config to libcutils
2015-04-02 21:21:45 +00:00
25b2fd5b4a
am 47437817: am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
...
* commit '474378176900f93d2b460e7570a7944d7c196f52':
fs_get_stats: move fs_config to libcutils
2015-04-02 21:21:44 +00:00
1c5f19eabe
fs_config: move fs_config to libcutils
...
Bug: 19908228
Change-Id: I4103ac395d0a28fd13173cc703e980aafe6c02e1
2015-04-02 13:56:00 -07:00
8efa6d3f0d
fs_get_stats: move fs_config to libcutils
...
Bug: 19908228
Change-Id: I668bf8e11b09ccc9c298382e54208f531844b0c5
2015-04-02 13:55:44 -07:00
31bca0bea9
am e71b5560: am 347195da: am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"
...
* commit 'e71b55606e2d0820f4a743f6c0e6b524f2354919':
build_image.py: Verity support for flashing non partition spanning fs
2015-04-02 18:57:32 +00:00
e71b55606e
am 347195da: am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"
...
* commit '347195da2ea801db95cf201fa7516bf392dc005a':
build_image.py: Verity support for flashing non partition spanning fs
2015-04-02 18:37:05 +00:00
6ddc360065
Merge "build_image.py: Verity support for flashing non partition spanning fs"
2015-04-02 18:18:21 +00:00
521a8dbd18
am 93d46584: am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
...
* commit '93d46584170a9aae1728cdb9010eef41e25b4d4a':
Add support to sign bootable images with vboot_signer
2015-04-01 17:33:36 +00:00
a48eb45cb6
am e37f1eb7: am 05b3468b: am 6c46e0bf: Show annotation documentation on class details
...
* commit 'e37f1eb78e53261a6749229bbc7e1b3d8222067d':
Show annotation documentation on class details
2015-04-01 17:27:13 +00:00
93d4658417
am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
...
* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
Add support to sign bootable images with vboot_signer
2015-04-01 17:15:29 +00:00
e37f1eb78e
am 05b3468b: am 6c46e0bf: Show annotation documentation on class details
...
* commit '05b3468b1ea68450e4dc348c8b33a7eb3b34e7cc':
Show annotation documentation on class details
2015-04-01 16:47:13 +00:00
d95e9fd267
Add support to sign bootable images with vboot_signer
...
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.
Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
2015-04-01 09:23:08 -07:00
dd063528ed
build_image.py: Verity support for flashing non partition spanning fs
...
Change-Id: Ic5f7b256ed9a31e99ebaebdf8a8a19ba9adcced3
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-04-01 00:50:39 +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
3d4466f3d6
am 146366bf: am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
...
* commit '146366bfb28e6f7c7b785188325fab40c4db000a':
Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:38:22 +00:00
146366bfb2
am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
...
* commit 'b6339d74fe575aa9e824ebb593c3064555a7af28':
Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:24:39 +00:00
ebb19aa01a
Fix up a few callers of GetTypeAndDevice.
...
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
2015-03-27 19:11:53 -07:00
f9aa358b4b
am ee8323b6: Fix bad merge.
...
* commit 'ee8323b6297c9e0e27524805c53d0eb3b271bc93':
Fix bad merge.
2015-03-28 00:02:13 +00:00
ee8323b629
Fix bad merge.
...
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
2015-03-27 23:50:31 +00:00
cd9ecc0258
resolved conflicts for merge of eecf00db to master
...
Change-Id: I7f268122c10152aff8ef59622edbba88db427fca
2015-03-27 16:37:23 -07:00
eecf00db59
resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp
...
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
2015-03-27 14:37:14 -07:00
99e22a57d0
Merge "Make releasetools pylint clean."
2015-03-27 18:40:02 +00:00
6c0618976c
Merge "Add bootsigner path as an option"
2015-03-26 23:03:13 +00:00
52ea2066a1
am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
...
* commit 'abc748c11cbba71a99f306d318c74b5336b28730':
Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:57:22 +00:00
a2292c94d1
Support to build image of root file system with /system and ramdisk combined.
...
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
(cherry-picked from commit 0eabd4f2c5
2015-03-26 10:35:00 -07:00
0eabd4f2c5
Support to build image of root file system with /system and ramdisk combined.
...
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-24 21:07:42 -07:00
8b72aefb5a
Make releasetools pylint clean.
...
This caught a few bugs/syntax errors (a few character classes were not
escaped properly in regex patterns, some indentation was illegal,
etc).
Change-Id: I50637607524e68c4fb9cad7167f58a46b8d26b2c
2015-03-24 11:05:16 -07:00
30b5e49796
am 220a0332: am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
...
* commit '220a0332d318d0dcf7d3611c78084e066ada8e54':
Run ZipFile.testzip() during zipfile tests.
2015-03-24 03:25:31 +00:00
b5f5bd6e1b
am 3e88a16b: am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"
...
* commit '3e88a16b0e5eb0896d52b5c4e3488527d9a95f26':
Fix the computation of basefilename
2015-03-24 03:25:24 +00:00
6f2e506b31
am 3b88235d: am 9f201b18: am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
...
* commit '3b88235d04156d8a0346d74b5d3a9575c3b02121':
Allow system images larger than 2GiB, pt. 2
2015-03-24 02:59:31 +00:00
228d947832
am 45aece22: am 62eed4d8: am b5901670: Merge "Fix the syntax error in the edify script generator"
...
* commit '45aece22330ec2621f2a72ef16675cfe128ae56b':
Fix the syntax error in the edify script generator
2015-03-24 01:30:59 +00:00
220a0332d3
am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
...
* commit 'c47f47b74f6ed6daa83e3f4357cf315a4b617f6e':
Run ZipFile.testzip() during zipfile tests.
2015-03-24 00:18:47 +00:00
5d60719e42
Merge "Run ZipFile.testzip() during zipfile tests."
2015-03-24 00:07:02 +00:00
3e88a16b0e
am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"
...
* commit '2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
Fix the computation of basefilename
2015-03-23 23:58:49 +00:00
d6d1beb88c
Run ZipFile.testzip() during zipfile tests.
...
This still doesn't catch the issue that [1] fixes, but it's probably a
good idea anyway.
[1]: https://android-review.googlesource.com/#/c/143469/
Change-Id: Iaa607ec7450d605b26114bd81ea41a14c6613c0e
2015-03-23 16:54:39 -07:00
eaf885b1d0
Fix the computation of basefilename
...
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
2015-03-23 16:05:26 -07:00
3b88235d04
am 9f201b18: am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
...
* commit '9f201b18be8a4cecd27d7b5635c0892fbb00c591':
Allow system images larger than 2GiB, pt. 2
2015-03-23 22:03:08 +00:00
6701db8145
Allow system images larger than 2GiB, pt. 2
...
We need to patch zipfile during close() too, because it refers to the
ZIP64 file size threshold when writing out the central directory
Bug: 18015246
Bug: 19888174
Change-Id: I1b49d653d0831fcc2106808f86c929d7a2b22ff3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-23 14:35:50 -07:00
45aece2233
am 62eed4d8: am b5901670: Merge "Fix the syntax error in the edify script generator"
...
* commit '62eed4d8a9eb71181965e38dacabd13cee091da2':
Fix the syntax error in the edify script generator
2015-03-23 03:43:30 +00:00
3910ebf468
Fix the syntax error in the edify script generator
...
file_getprop() always expects two arguments.
Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-03-22 14:20:48 -07:00
b71d609061
am 928b851c: am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"
...
* commit '928b851ca178733ba61eef72a1b7e004f9a111e7':
Make the generated OTAs repeatable
2015-03-20 03:33:21 +00:00
928b851ca1
am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"
...
* commit 'ae9787514d5709dff766f4791c00a4875eebbf50':
Make the generated OTAs repeatable
2015-03-20 03:27:55 +00:00
b8c8717191
Make the generated OTAs repeatable
...
The generated OTAs are supposed to be repeatable. The use of dict in
blockimgdiff.py breaks the assumption for block-based OTAs. Fixed by
using OrderedDict instead.
Change-Id: I945bdc879912ba174ca330c152b1f8fc7ed211ac
2015-03-19 19:42:12 -07:00
04ecdda5d0
am 48fe5b7c: am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."
...
* commit '48fe5b7cadca3c945e81182411e9537cb11d81d3':
Allow system images larger than 2GiB.
2015-03-19 21:30:20 +00:00
48fe5b7cad
am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."
...
* commit 'fc2671201caeac485440c2aa146f35a99002bca2':
Allow system images larger than 2GiB.
2015-03-19 21:24:59 +00:00
8e0178d41b
Allow system images larger than 2GiB.
...
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
The bug (b/19364241) in original commit has been fixed.
Bug: 18015246
Bug: 19364241
Bug: 19839468
(cherry picked from commit cd082d4bfe
2015-03-19 13:59:01 -07:00
2c92413e72
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: Iaf834a2d99dfea0bb423a4a2aa09e8906424482d
(cherry picked from commit daebaa6ed3
2015-03-18 16:13:10 -07:00
aecbda7f26
resolved conflicts for merge of 22311914 to master
...
Change-Id: I8684191fa3efea0ed546bbad076f8760a13c5c81
2015-03-14 00:26:06 -07:00
2231191482
resolved conflicts for merge of 6502ae93 to lmp-mr1-dev-plus-aosp
...
Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee
2015-03-13 22:40:38 -07:00
dd2a5892e5
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: Ic630346eab2a993a84d0aeaacd7167ef62cc24f6
(cherry picked from commit daebaa6ed3
2015-03-13 17:57:15 -07:00
d4ca3b38d9
am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
...
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
Support to configure and build multiple custom images.
2015-03-14 00:31:44 +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
5fcf1094f9
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
2015-03-13 16:48:02 -07:00
910b005f18
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
(cherry picked from commit cad78c12fb
2015-03-13 11:36:14 -07:00
a76e9b7bd8
am edb88c94: Merge "Fix the error that free_string is not defined."
...
* commit 'edb88c94fb628a66fdf4e3d1eda844e6bb0b9bf3':
Fix the error that free_string is not defined.
2015-03-13 11:23:17 +00:00
3de365bb2f
am ae524f60: am daebaa6e: Restrict the verification in block-based incremental OTAs
...
* commit 'ae524f60bce085971480f27a6b75db13ad970c11':
Restrict the verification in block-based incremental OTAs
2015-03-12 23:08:54 +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
209108298f
am 0aef0966: am fafe5ac8: Merge "Signapk.java: hide the password"
...
* commit '0aef09668e04b1de2ab86291c5f734a5dc718891':
Signapk.java: hide the password
2015-03-12 15:35:56 +00:00
7b985f6aed
Fix the error that free_string is not defined.
...
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:19573713
(cherry picked from commit 7ca20d1a1c
2015-03-11 17:22:43 +00:00
dd67a295cc
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
(cherry picked from commit cac671a9d1
2015-03-11 17:22:06 +00:00
0aef09668e
am fafe5ac8: Merge "Signapk.java: hide the password"
...
* commit 'fafe5ac81940caaa6b222433a2fd9ef5e1239686':
Signapk.java: hide the password
2015-03-11 17:00:10 +00:00
fafe5ac819
Merge "Signapk.java: hide the password"
2015-03-11 16:46:00 +00:00
29a0178993
am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master
...
* commit '9b19382f0e55be199da4b3f604fc114aba8fb2fc':
Allow flashing a squashfs system image
2015-03-05 00:01:46 +00:00
9b19382f0e
resolved conflicts for merge of fc759204 to stage-aosp-master
...
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
b97746ef09
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 18:54:50 -08:00
73f17f0f76
Merge "Allow flashing a squashfs system image"
2015-03-04 00:42:12 +00:00
6894695819
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 15:14:37 -08:00
7ca20d1a1c
Fix the error that free_string is not defined.
...
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:19573713
2015-03-02 17:21:38 -08:00
0cb10289e7
am de979a02: am 2479a098: am 30b5ed7b: Merge "Fix zipalign README file and usage strings."
...
* commit 'de979a0205ee181d20c7cb65a7112eac1c570498':
Fix zipalign README file and usage strings.
2015-02-27 17:43:01 +00:00
de979a0205
am 2479a098: am 30b5ed7b: Merge "Fix zipalign README file and usage strings."
...
* commit '2479a0987da03f0059c42991bf59e3b32551e107':
Fix zipalign README file and usage strings.
2015-02-27 17:35:57 +00:00
2479a0987d
am 30b5ed7b: Merge "Fix zipalign README file and usage strings."
...
* commit '30b5ed7b1e8c67c816d64ad1b7c9bde3c3b5019c':
Fix zipalign README file and usage strings.
2015-02-27 17:26:49 +00:00
b5fa03960c
am 41d35af2: am 3e7688d0: am 3c242c5d: am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '41d35af217004a51c2ac5c2adebdb67a18a25fc2':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:08:57 +00:00
41d35af217
am 3e7688d0: am 3c242c5d: am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '3e7688d0415af5cb805f3ece39fec4303eb834a9':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:03:18 +00:00
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
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
e0b8d19f31
Fix zipalign README file and usage strings.
...
Addresses comments from change 13e5965306
2015-02-27 14:17:17 +00:00
2b486dc8c3
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
2015-02-27 07:58:58 +00:00
7a9e388405
am 738871f6: am e886392c: am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
...
* commit '738871f6eb3c372b60928e761f0dc24e46a6bba5':
Store native libs aligned to PAGE_SIZE
2015-02-26 12:58:11 +00:00
e886392c37
am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
...
* commit '37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7':
Store native libs aligned to PAGE_SIZE
2015-02-26 12:45:34 +00:00
13e5965306
Store native libs aligned to PAGE_SIZE
...
- Add a new flag to zipalign (-p) that page aligns shared
libraries (zip entries ending with ".so") in the archive.
- Add a new build variable LOCAL_PAGE_ALIGN_SHARED_LIBRARIES
to turn on this behaviour in zipalign.
- Add a new LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS to control
zip behaviour.
Bug: 8076853
Bug: 19330157
Co-Authored-By: Simon Baldwin <simonb@google.com>
Co-Authored-By: Dimitry Ivanov <dimitry@google.com>
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-02-26 12:31:40 +00:00
d2d9747199
am b89ec381: am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:44:23 +00:00
b89ec38113
am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit '070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:37:10 +00:00
ffd4fee911
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
2015-02-13 18:48:17 +00:00
2de68bbbf4
Revert "Allow system images larger than 2GiB."
...
This reverts commit cd082d4bfe
2015-02-13 18:47:51 +00:00
cad78c12fb
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
2015-02-11 19:28:08 -08:00
e204868f1f
Add bootsigner path as an option
...
Change-Id: I71e8cb96b7a33cc02897fc24f6f3f61c7608bfe3
2015-02-11 15:43:02 +00:00
f8136017fa
am 1cd422cd: am 19b8c2f7: am 8cde3e71: am cf80e847: am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '1cd422cd3d67c0821b29c75e91cac764ce4d1b47':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-11 02:54:59 +00:00
1cd422cd3d
am 19b8c2f7: am 8cde3e71: am cf80e847: am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '19b8c2f776036288dfad8983e38419c3d4316fc9':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 23:21:02 +00:00
8cde3e71e7
am cf80e847: am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:12:49 +00:00
cf80e8479b
am d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'd162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:05:42 +00:00
4ec52a93d8
am 234d122e: am c6af9b8f: am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '234d122ea62a43aa3a1d6cfbf11a75e5dbe3f8e0':
Update vendor fingerprint.
2015-02-09 04:14:09 +00:00
39a68ab310
am f8f91c94: am 3907eaf8: am cd082d4b: Allow system images larger than 2GiB.
...
* commit 'f8f91c94706a953f91bf75e919b4302db6a9a99f':
Allow system images larger than 2GiB.
2015-02-09 04:14:08 +00:00
234d122ea6
am c6af9b8f: am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit 'c6af9b8f4a09cc4208ad119218f57022d6fead5b':
Update vendor fingerprint.
2015-02-07 00:06:13 +00:00
f8f91c9470
am 3907eaf8: am cd082d4b: Allow system images larger than 2GiB.
...
* commit '3907eaf8b7c6f7209c4cb11a6b8b66a34f292151':
Allow system images larger than 2GiB.
2015-02-07 00:06:10 +00:00
28b2b00adb
Merge "Update vendor fingerprint." into lmp-mr1-dev
2015-02-06 22:21:06 +00:00
cd082d4bfe
Allow system images larger than 2GiB.
...
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug: 18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
2015-02-06 13:24:06 -08:00
2625d27151
Update vendor fingerprint.
...
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
431d42f857
Merge "Change transfer list format to include block hashes"
2015-02-06 10:27:11 +00:00
d162be5b5f
change video analytics to distinguish between start and resume events.
...
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
2015-02-05 17:49:49 -08:00
37c84ae309
doc: Add Japanese version of DAC/distribute/ page.
...
Bug: 18847144
Change-Id: I1bce6f94149e31ddb45b5946951cf6877bf4bf3b
2015-02-05 21:56:48 +09:00
18202932d1
am f4bd044f: am d51b0fd3: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'f4bd044f09529430bdc9ac3cba083a39867dfab4':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:36:41 +00:00
f4bd044f09
am d51b0fd3: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'd51b0fd3e4b3b39a36019bb1cd06fe29979f4ee8':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:31:30 +00:00
38df101343
Fail even dev build when property value exceeds length limit.
...
Let developers know the issue earlier when they set up new
products.
Change-Id: I3f2ecbc3a833c1a8a84bd75407a5c035e5fea70a
2015-02-04 15:10:59 -08:00
3e9b20e430
am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
...
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
16ba2ed82b
resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
...
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
14cc23d433
Remove support of factory ramdisk/bundle.
...
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
cac671a9d1
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
2015-01-30 11:34:27 +00:00
3de822dd3c
am 5827eec0: am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '5827eec013e88279b87cfed1b96bc675a1f1329d':
verify system and vendor image together before patching.
2015-01-29 17:21:12 +00:00
5827eec013
am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit 'fbc8c1454e8f2167635398078bb53033dc90f15d':
verify system and vendor image together before patching.
2015-01-28 23:42:18 +00:00
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
41759234f0
am 675a726f: resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
...
* commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8':
Add ro.product.locale
2015-01-22 19:58:04 +00:00
675a726fe4
resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
b5b67b7544
am 4433ac85: am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit '4433ac859c90192914c31f3f8d39230aac41852c':
Add new subtab under Distribute tab.
2015-01-16 20:06:35 +00:00
4433ac859c
am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit 'd12838890563b2fb4532630373760a995970f687':
Add new subtab under Distribute tab.
2015-01-16 18:17:59 +00:00
48141e0599
am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
baf3eb93ee
Add ro.product.locale
...
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.
bug: 17691569
Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
5a97f24411
am 529a107f: Add new subtab under Distribute tab.
...
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
529a107f9d
Add new subtab under Distribute tab.
...
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
75bcea0267
verify system and vendor image together before patching.
...
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
0d30007b38
am 7a864af1: am aa112716: Merge "build_image: Set file system labels on disk images"
...
* commit '7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
build_image: Set file system labels on disk images
2015-01-07 20:41:57 +00:00
7a864af1b7
am aa112716: Merge "build_image: Set file system labels on disk images"
...
* commit 'aa112716067167d58d1db37aaf8adc49b83b59a1':
build_image: Set file system labels on disk images
2015-01-07 20:28:17 +00:00
af7cc3eea6
am 579be067: am 35764d6f: am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '579be0670507ca380d361ffdbc2cff7f53e9d0cd':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 19:55:04 +00:00
579be06705
am 35764d6f: am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '35764d6f99761ed63d2d762be4bddf0a3a1e5e0a':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:27:21 +00:00
ef789fa152
am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:00:09 +00:00
8ed01f3816
build_image: Set file system labels on disk images
...
When building images set the mount point (data,cache,system) as the
filesystem label on the generated image. This is required for the
Android Emulator.
IMPORTANT: This depends on the following patch to system/extras/:
https://android-review.googlesource.com/#/c/120047/
which has already been submitted to AOSP and merged into the
internal tree.
Change-Id: Iaeb45462570c26d37980f1cc5d8a1b929e476c89
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-05 17:49:37 +01:00
4c67290d5a
am cc717505: am e6bf9dcd: am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'cc717505e4590d29ec544a0d58ac26f3ce8d0e24':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:30:59 +00:00
8123730d50
am be8b1630: am fa963c73: am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit 'be8b1630aa638e83c1b21c2d509a4251bc9f1d8d':
remove the Helpouts recruitment banner
2014-12-19 17:30:58 +00:00
cc717505e4
am e6bf9dcd: am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'e6bf9dcde7d150885a98519512c725066601db10':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:24:04 +00:00
be8b1630aa
am fa963c73: am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit 'fa963c7379e8e7c9d0fce2c6e24f599bce90b396':
remove the Helpouts recruitment banner
2014-12-19 17:24:03 +00:00
02be18043c
am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
2fbb4e30e2
am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
bb9eda64a3
am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:05:23 +00:00
d194c6ac80
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
2014-12-18 16:50:13 +00:00
da51ee7daa
am 7ad7ff73: am 2ed92cda: am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit '7ad7ff73586416618997076a89105892832966d6':
make shadowbox video always centered to fit the window height
2014-12-17 20:37:45 +00:00
7ad7ff7358
am 2ed92cda: am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit '2ed92cda0d807ee41f2821deb425f15a023c05b1':
make shadowbox video always centered to fit the window height
2014-12-17 20:32:27 +00:00
19832ae16a
am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit 'd742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
2014-12-17 20:20:20 +00:00
fdb9fa0e2b
am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '351c908b757fcfee03d5f15b4a29cb9a48f93f46':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:31:06 +00:00
94e0b53086
fix bug that allowed only one video in the shadowbox per page
...
bug: 18777918
Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
2014-12-16 19:07:08 -08:00
c6e8a05f49
Fix Documentation typo when showAnnotations is used with doclava
...
Bug: 18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
2014-12-16 23:13:40 +00:00
39bac0222b
am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit 'bfe3fc64add62518b619a052193269d3281475b9':
remove the Helpouts recruitment banner
2014-12-16 18:20:31 +00:00
bf644aa564
remove the Helpouts recruitment banner
...
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
2014-12-16 10:05:03 -08:00
c8f5e7f0b5
am 9c45dd09: am 6437b637: am 5576ef5b: am b96b2a4a: am 91f2ba64: am a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit '9c45dd092220dfe225fee406a7f9b999aedee1e6':
docs: SHA update in sdkpage.cs
2014-12-16 11:02:57 +00:00
d79a1e8ad2
am 2bfbd1d7: am 7d4e6bbe: am 96ac360b: am 2881d6f3: am 9f88a60d: am 481f15c1: set youtube player lang based on user pref and enable captions when not English
...
* commit '2bfbd1d78089484be797cc6c6d2ee4fe93b05440':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 11:02:56 +00:00
e6d8ec69dc
am 17884a53: am 5b566fb9: am 8f207ca0: am 2c3ae43f: am 29e06142: am d24088c0: add analytics event to track from which page a video was started
...
* commit '17884a531e5370fa2e2e0fe2591d7b3978272cae':
add analytics event to track from which page a video was started
2014-12-16 11:02:55 +00:00
5ed8002e6f
am e8f8ceaa: am 08810fc4: am 305f55cd: am 3ff2fd14: am d7dbaf5c: am ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit 'e8f8ceaa4c435a1844773edce6609077a85cd777':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 11:02:54 +00:00
9c45dd0922
am 6437b637: am 5576ef5b: am b96b2a4a: am 91f2ba64: am a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit '6437b637d192fa460945bed5d339395827784442':
docs: SHA update in sdkpage.cs
2014-12-16 03:53:58 +00:00
2bfbd1d780
am 7d4e6bbe: am 96ac360b: am 2881d6f3: am 9f88a60d: am 481f15c1: set youtube player lang based on user pref and enable captions when not English
...
* commit '7d4e6bbe83bb32f7d12cd8dc7deea318857967b7':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 03:53:57 +00:00
17884a531e
am 5b566fb9: am 8f207ca0: am 2c3ae43f: am 29e06142: am d24088c0: add analytics event to track from which page a video was started
...
* commit '5b566fb92913983e7fa6a9ff75f287dd7ec1446d':
add analytics event to track from which page a video was started
2014-12-16 03:53:56 +00:00
e8f8ceaa4c
am 08810fc4: am 305f55cd: am 3ff2fd14: am d7dbaf5c: am ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit '08810fc42c1545b1116f2c88cd1595756e9fe418':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 03:53:55 +00:00
5576ef5b71
am b96b2a4a: am 91f2ba64: am a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit 'b96b2a4ae621e1bd8529ef50bc00ddc048207ca3':
docs: SHA update in sdkpage.cs
2014-12-16 03:42:03 +00:00
96ac360b39
am 2881d6f3: am 9f88a60d: am 481f15c1: set youtube player lang based on user pref and enable captions when not English
...
* commit '2881d6f31b9daf9a3d701671eae3297040d84799':
set youtube player lang based on user pref and enable captions when not English
2014-12-16 03:41:58 +00:00
8f207ca046
am 2c3ae43f: am 29e06142: am d24088c0: add analytics event to track from which page a video was started
...
* commit '2c3ae43f9e8329d7f0c24192fe1fd400d1a870b2':
add analytics event to track from which page a video was started
2014-12-16 03:40:27 +00:00
305f55cd29
am 3ff2fd14: am d7dbaf5c: am ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit '3ff2fd14b1276e3b9c0473bd987c1bb34925ef86':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-16 03:39:31 +00:00
e502be704f
am 2b800123: am 34a1bdeb: am ea1dc699: Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
...
* commit '2b800123c405f444906c9ff69c62d9db4de0103c':
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
2014-12-15 22:50:58 +00:00
2b800123c4
am 34a1bdeb: am ea1dc699: Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
...
* commit '34a1bdeb333ab15ddc3840ac3e5d1e8c3245d44a':
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
2014-12-15 22:46:33 +00:00
ea1dc69968
Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
2014-12-15 21:35:19 +00:00
d742274e14
am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit 'b05558cf01a42214efd0d8c6484c62a7b0212947':
make shadowbox video always centered to fit the window height
2014-12-15 18:00:18 +00:00
3de83c1bcd
make shadowbox video always centered to fit the window height
...
Change-Id: I03f8ffac555dbbbbd5538fedf13413aca031fd74
2014-12-15 09:27:48 -08:00
b96b2a4ae6
am 91f2ba64: am a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
...
* commit '91f2ba648f4187cea415ddc826ef155afe7e8122':
docs: SHA update in sdkpage.cs
2014-12-13 00:55:39 +00:00
a441771265
Merge "docs: SHA update in sdkpage.cs" into lmp-docs
2014-12-13 00:43:10 +00:00
2881d6f31b
am 9f88a60d: am 481f15c1: set youtube player lang based on user pref and enable captions when not English
...
* commit '9f88a60d5cb57552f88c26d7531ee235415dd381':
set youtube player lang based on user pref and enable captions when not English
2014-12-13 00:30:28 +00:00
8d3c694de1
docs: SHA update in sdkpage.cs
...
Change-Id: I2c94b1af228295a3650d17e2c00023e5b52ec1b9
2014-12-12 16:21:03 -08:00
481f15c172
set youtube player lang based on user pref and enable captions when not English
...
Change-Id: I3208074713d3f7b571a22a7ef8f18a9131827e98
2014-12-12 11:57:27 -08:00
2c3ae43f9e
am 29e06142: am d24088c0: add analytics event to track from which page a video was started
...
* commit '29e06142fdb2b6225d38f0ce141d28156bbdfea3':
add analytics event to track from which page a video was started
2014-12-12 19:53:32 +00:00
d24088c08d
add analytics event to track from which page a video was started
...
Change-Id: I9ba1f992c09fb9e18c55bca5bf3892e50f37012a
2014-12-12 11:37:22 -08:00
3ff2fd14b1
am d7dbaf5c: am ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
...
* commit 'd7dbaf5c14cf1e6669df0d21f552a9b21cb63fb7':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
2014-12-12 18:42:58 +00:00
ed677d7a0e
update analytics event for searches to make query case-insensitive
...
and save the URL instead of doc title.
Change-Id: Iad8c5f4873173f6964fc4ebffee8aef878891a8e
2014-12-12 10:19:17 -08:00
f050fe4aec
am 18b3eb1d: am 425aa9f9: am 79ad9c78: am 8aebbf0d: am 0ecb5a68: add links to release notes
...
* commit '18b3eb1de57f015aef294f776a926518027c5eda':
add links to release notes
2014-12-10 17:43:46 +00:00
acf4c4a9a7
am 46c4bcdc: am 13c3e7eb: am 03e066b7: am 83e96ca8: am 1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
...
* commit '46c4bcdcb8811cb50a7317b4bcba585e66d1f1f3':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-10 17:43:45 +00:00
18b3eb1de5
am 425aa9f9: am 79ad9c78: am 8aebbf0d: am 0ecb5a68: add links to release notes
...
* commit '425aa9f99ba73cea3d469727d5eb446eeb43d0c9':
add links to release notes
2014-12-09 23:15:06 +00:00
Dirk Dougherty