Commit Graph

3183 Commits

Author SHA1 Message Date
Joe Fernandez 53b98761b2 docs: fix sticky header hiding RenderScript reference headings
b/20637508

Change-Id: I64996db4fc986cbe0f4506b5524a708a9e14cbc8
2015-04-29 21:04:14 -07:00
Jeff Brown 7f2ceab5af Add float support to binary event log.
Bug: 20664753
Change-Id: Iab232b1f172094919839d57f15644dfb2eaa1425
2015-04-28 17:52:07 -07:00
Sami Tolvanen 3edeb4e97b am 045d817c: am 497b74d5: am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '045d817cce8cb1feb0186b537306cabf1a5069cd':
  Check partition hash before resorting to block_image_verify
2015-04-25 10:01:53 +00:00
Sami Tolvanen 497b74d5a2 am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit 'd21d1d273b83e701667beeabe0c76fd6888e15fc':
  Check partition hash before resorting to block_image_verify
2015-04-25 09:32:33 +00:00
Sami Tolvanen e09d096ed6 Check partition hash before resorting to block_image_verify
It's not necessary to call block_image_verify for the most common
case where we attempt an update for the first time and the target
partition has expected contents. It is sufficient to confirm that
the target partition is intact.

Computing a hash is much faster than simulating the update, which
means this change should make the update speed for v3 much closer
to v2 for the common case. If the update was interrupted, this is
going to make resuming somewhat slower, of course. Hopefully this
should be rather rare.

Bug: 20309033
Change-Id: I04792f3681bf2cd5d9a4e1c41eb883c7f26c6f58
2015-04-24 10:56:59 +00:00
Tao Bao 1699a90b21 am b93b9ec4: am d8c62ae5: am 347d8e66: am 7f47c133: Merge "Add support for full radio option"
* commit 'b93b9ec42d008a5478018d8055791e1d1449fa36':
  Add support for full radio option
2015-04-22 22:18:52 +00:00
Tao Bao d8c62ae577 am 347d8e66: am 7f47c133: Merge "Add support for full radio option"
* commit '347d8e66228ab09af1ec458632cb51c20a818e06':
  Add support for full radio option
2015-04-22 18:55:14 +00:00
Tao Bao 43078aa37a Add support for full radio option
Occasionally we need to include full radio image in incremental OTAs.
Adding --full_radio option to support that.

It needs matching changes in the releasetools.py in the target_files
zip, which comes from device/<vendor>/<device>/releasetools.py.

Bug: 19994922
Change-Id: Id1fb3a9cdb7e67dd9dbadd8fb6cd5fccd358820e
2015-04-21 16:54:52 -07:00
Ryosuke Matsuuchi 40af438100 doc: Add Korean version of DAC/distribute/ page.
Bug: 20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
(cherry picked from commit 25799ca584)
2015-04-19 23:09:37 +00:00
Ryosuke Matsuuchi dd56f344a5 am bdc47592: am 959d12b1: am f98bdce1: am 90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit 'bdc47592dbf4b6258b947677f38b0ef95b6ea241':
  doc: Add Korean version of DAC/distribute/ page.
2015-04-19 05:53:32 +00:00
Ryosuke Matsuuchi bdc47592db am 959d12b1: am f98bdce1: am 90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '959d12b11eabfde1c7b4688eda44b90d0e641d2e':
  doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:55:07 +00: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
Sami Tolvanen 8f9f7c0672 am c4d303e9: am 7788547f: am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit 'c4d303e958e1f3475fd1070bdb307b4f675f3bdd':
  Calculate max_stashed_blocks correctly for block OTA v3
2015-04-17 19:30:23 +00:00
Sami Tolvanen c4d303e958 am 7788547f: am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit '7788547ff34d93b5196933eedb9f006fb1fe9f4d':
  Calculate max_stashed_blocks correctly for block OTA v3
2015-04-17 19:09:02 +00:00
Sami Tolvanen 29f529f33e Calculate max_stashed_blocks correctly for block OTA v3
The updater automatically stashes overlapping source blocks to
make it possible to resume if the command performing the update
is interrupted. However, blockimgdiff.py does not take this into
account and therefore, max_stashed_blocks indicates only the
number of explicitly stashed blocks. Change blockimgdiff.py to
correctly calculate the maximum used stash space, including any
automatically stashed blocks.

Bug: 20309033
Change-Id: Ibf5cb1abc38c54e60a6ad3ce4cbce43556b08ac2
2015-04-17 16:28:08 +01: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
Glenn Kasten 6716ca263f am 144423a0: am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
* commit '144423a0580fe03a00053da785bcfdc8e46a87b5':
  Fix bookmark title
2015-04-16 23:59:05 +00:00
Glenn Kasten 144423a058 am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
* commit '9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
  Fix bookmark title
2015-04-16 23:37:23 +00:00
Glenn Kasten 1004eccb16 Merge "Fix bookmark title" 2015-04-16 23:12:50 +00:00
Glenn Kasten 1efbc8996e Fix bookmark title
Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
2015-04-16 11:56:22 -07:00
Mark Salyzyn 36972044fb am db6a4158: am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
* commit 'db6a4158fe45c1ff94fe71a94ea48ebb24c16799':
  build: fs_config_generate must open file in binary mode
2015-04-16 17:53:46 +00:00
Mark Salyzyn db6a4158fe am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
* commit '86e441fc9c4191439b53b9917cf432ca2d16330a':
  build: fs_config_generate must open file in binary mode
2015-04-16 17:31:36 +00:00
Mark Salyzyn 6024069f37 build: fs_config_generate must open file in binary mode
Bug: 19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65
2015-04-16 08:43:33 -07:00
Mark Salyzyn a55ab6fff6 am d756e736: am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit 'd756e7367ab60d5e4138d7561aaabf4256e3d247':
  fs_config: Add fs_config_generate
2015-04-16 00:38:06 +00:00
Mark Salyzyn d756e7367a am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit 'c9402076b65025c994c28bac0350d5b600d1d6fe':
  fs_config: Add fs_config_generate
2015-04-16 00:15:47 +00:00
Mark Salyzyn a910c7bd58 am 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '54c1d36eaee59c62a652b071bdec9e71c40002ae':
  fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:56:22 +00:00
Mark Salyzyn 54c1d36eae am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
  fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:40:50 +00:00
Mark Salyzyn 06b91b9bcf fs_config: Add fs_config_generate
fs_config_generate_$(TARGET_DEVICE) is built based off the content
of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules
fs_config_dirs and fs_config_file to utilize this command
for target contents:

fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir
fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file

In order to use this feature, one must have the fs_config_dirs and
fs_config_files in the $(PRODUCT_PACKAGES) list defined in the
device make files in $(TARGET_DEVICE_DIR). And either an
android_filesystem_config.h file in that directory, or define a
path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one.

Bug: 19908228
Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-15 14:17:12 -07:00
Mark Salyzyn 073a9ebbbf fs_config: use libcutils and libselinux shared libraries
- move to libcutils.so and libselinux.so as shared now that
  they are in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
  called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa
2015-04-15 14:17:07 -07:00
Clay Murphy 30f6657d43 Merge "Docs: improve the highlighting of definition lists (<dt> and <dd> elements)" 2015-04-14 18:43:03 +00:00
Joe Fernandez c11559b204 am fd7b099e: am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit 'fd7b099e2d9c61d4615b99e499e30bbd99ecccca':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:56:12 +00:00
Clay Murphy c63c3e3049 Docs: improve the highlighting of definition lists (<dt> and <dd> elements)
Bug: 18947865
Change-Id: Ibe0966bed1deb2c45d0f323c809d36dc3f33dd17
2015-04-14 10:50:29 -07:00
Joe Fernandez fd7b099e2d am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
* commit '983f9e494f0c7f73577101adf391143753dfc4ff':
  docs: add new style elements for Material Design cross-references
2015-04-14 17:35:00 +00: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
Dirk Dougherty 99f9af659f am 3c5e45ff: am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '3c5e45ff37e27cea465c24d4c1371bd05e122873':
  Increment metadata files for new families pages.
2015-04-14 05:13:29 +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 3c5e45ff37 am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
* commit '70b2a811ccd6fa74770f5747aa5cd97d3bae4b33':
  Increment metadata files for new families pages.
2015-04-14 04:54:27 +00: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
smain@google.com de678b975e am 0d98fcbd: am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
* commit '0d98fcbd93d661348dcaf17647614254d2265ab2':
  skeleton structure for NDK site
2015-04-14 03:10:01 +00:00
smain@google.com 0d98fcbd93 am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
* commit 'd4565d8f38bb89a385fa27c42f0129e7330bb5f1':
  skeleton structure for NDK site
2015-04-14 02:43:59 +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 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
David Friedman 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
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 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
David Friedman 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
David Friedman 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
David Friedman 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
David Friedman 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
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 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
David Friedman 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
David Friedman 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
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 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
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
Sami Tolvanen e18196095b Merge "Separate boot and recovery image signing from dm-verity" 2015-04-10 09:44:47 +00:00
Tao Bao 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
Tao Bao 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
Tao Bao 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
Sami Tolvanen 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 1c5f19eabe fs_config: move fs_config to libcutils
Bug: 19908228
Change-Id: I4103ac395d0a28fd13173cc703e980aafe6c02e1
2015-04-02 13:56:00 -07:00
Mark Salyzyn 8efa6d3f0d fs_get_stats: move fs_config to libcutils
Bug: 19908228
Change-Id: I668bf8e11b09ccc9c298382e54208f531844b0c5
2015-04-02 13:55:44 -07:00
Mohamad Ayyash 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
Mohamad Ayyash 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
Mohamad Ayyash 6ddc360065 Merge "build_image.py: Verity support for flashing non partition spanning fs" 2015-04-02 18:18:21 +00:00
Tao Bao 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
Jeff Arneson 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
Tao Bao 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
Jeff Arneson 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
Tao Bao 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
Mohamad Ayyash 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
Jeff Arneson 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
Dan Albert 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
Dan Albert 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
Dan Albert ebb19aa01a Fix up a few callers of GetTypeAndDevice.
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
2015-03-27 19:11:53 -07:00
Dan Albert f9aa358b4b am ee8323b6: Fix bad merge.
* commit 'ee8323b6297c9e0e27524805c53d0eb3b271bc93':
  Fix bad merge.
2015-03-28 00:02:13 +00:00
Dan Albert ee8323b629 Fix bad merge.
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
2015-03-27 23:50:31 +00:00
Dan Albert cd9ecc0258 resolved conflicts for merge of eecf00db to master
Change-Id: I7f268122c10152aff8ef59622edbba88db427fca
2015-03-27 16:37:23 -07:00
Dan Albert eecf00db59 resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
2015-03-27 14:37:14 -07:00
Dan Albert 99e22a57d0 Merge "Make releasetools pylint clean." 2015-03-27 18:40:02 +00:00
Baligh Uddin 6c0618976c Merge "Add bootsigner path as an option" 2015-03-26 23:03:13 +00:00
Ying Wang 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
Ying Wang 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)

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-26 10:35:00 -07:00
Ying Wang 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
Dan Albert 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
Dan Albert 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
Tao Bao 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
Greg Hackmann 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
Tao Bao 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
Dan Albert 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
Dan Albert 5d60719e42 Merge "Run ZipFile.testzip() during zipfile tests." 2015-03-24 00:07:02 +00:00
Tao Bao 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
Dan Albert 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
Tao Bao eaf885b1d0 Fix the computation of basefilename
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
2015-03-23 16:05:26 -07:00
Greg Hackmann 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
Greg Hackmann 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
Tao Bao 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
Tao Bao 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
Tao Bao 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
Tao Bao 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
Tao Bao 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
Tao Bao 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
Tao Bao 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
Dan Albert 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)

Change-Id: I7b5cc310e0a9ba894533b53cb998afd5ce96d8c6
2015-03-19 13:59:01 -07:00
Tao Bao 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
Tao Bao aecbda7f26 resolved conflicts for merge of 22311914 to master
Change-Id: I8684191fa3efea0ed546bbad076f8760a13c5c81
2015-03-14 00:26:06 -07:00
Tao Bao 2231191482 resolved conflicts for merge of 6502ae93 to lmp-mr1-dev-plus-aosp
Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee
2015-03-13 22:40:38 -07:00
Tao Bao 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
Ying Wang 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
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
Ying Wang 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
Michael Runge 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
Sami Tolvanen 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
Tao Bao 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
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
Ying Wang 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
Jesse Zhao 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
Sami Tolvanen 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
Ying Wang 0aef09668e am fafe5ac8: Merge "Signapk.java: hide the password"
* commit 'fafe5ac81940caaa6b222433a2fd9ef5e1239686':
  Signapk.java: hide the password
2015-03-11 17:00:10 +00:00
Ying Wang fafe5ac819 Merge "Signapk.java: hide the password" 2015-03-11 16:46:00 +00:00
Mohamad Ayyash 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
Mohamad Ayyash 9b19382f0e resolved conflicts for merge of fc759204 to stage-aosp-master
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
Mohamad Ayyash 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
Mohamad Ayyash 73f17f0f76 Merge "Allow flashing a squashfs system image" 2015-03-04 00:42:12 +00:00
Mohamad Ayyash 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
Jesse Zhao 7ca20d1a1c Fix the error that free_string is not defined.
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:19573713
2015-03-02 17:21:38 -08:00
Narayan Kamath 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
Narayan Kamath 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
Narayan Kamath 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
Ryosuke Matsuuchi 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
Ryosuke Matsuuchi 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
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
Narayan Kamath e0b8d19f31 Fix zipalign README file and usage strings.
Addresses comments from change 13e5965306.

Change-Id: I0a2c0048781858d3aa06347a77220547cfcdcebe
2015-02-27 14:17:17 +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
Narayan Kamath 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
Narayan Kamath 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
Dmitriy Ivanov 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
Justin Harrison 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
Justin Harrison 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
Justin Harrison ffd4fee911 Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 2015-02-13 18:48:17 +00:00
Justin Harrison 2de68bbbf4 Revert "Allow system images larger than 2GiB."
This reverts commit cd082d4bfe.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Michael Runge 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
Baligh Uddin e204868f1f Add bootsigner path as an option
Change-Id: I71e8cb96b7a33cc02897fc24f6f3f61c7608bfe3
2015-02-11 15:43:02 +00:00
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Jesse Zhao 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
Dan Albert 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
Jesse Zhao 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
Dan Albert 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
Jesse Zhao 28b2b00adb Merge "Update vendor fingerprint." into lmp-mr1-dev 2015-02-06 22:21:06 +00:00
Dan Albert 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
Jesse Zhao 2625d27151 Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
Sami Tolvanen 431d42f857 Merge "Change transfer list format to include block hashes" 2015-02-06 10:27:11 +00:00
smain@google.com 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
Ryosuke Matsuuchi 37c84ae309 doc: Add Japanese version of DAC/distribute/ page.
Bug: 18847144
Change-Id: I1bce6f94149e31ddb45b5946951cf6877bf4bf3b
2015-02-05 21:56:48 +09:00
Ying Wang 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
Ying Wang 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
Ying Wang 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
Ying Wang 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
Ying Wang 16ba2ed82b resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang 14cc23d433 Remove support of factory ramdisk/bundle.
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Sami Tolvanen 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
Jesse Zhao 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
Jesse Zhao 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
Jesse Zhao 0c9384d512 Merge "verify system and vendor image together before patching." into lmp-mr1-dev 2015-01-28 23:30:54 +00:00
Narayan Kamath 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
Narayan Kamath 675a726fe4 resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Dirk Dougherty 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
Dirk Dougherty 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
Dirk Dougherty 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
Narayan Kamath 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
Dirk Dougherty 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
Dirk Dougherty 529a107f9d Add new subtab under Distribute tab.
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Jesse Zhao 75bcea0267 verify system and vendor image together before patching.
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
David Turner 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
David Turner 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
Jeff Arneson 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
Jeff Arneson 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
Jeff Arneson 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
Christoffer Dall 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Jeff Arneson 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
Jeff Arneson d194c6ac80 Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs 2014-12-18 16:50:13 +00:00
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Jeff Arneson c6e8a05f49 Fix Documentation typo when showAnnotations is used with doclava
Bug: 18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
2014-12-16 23:13:40 +00:00
smain@google.com 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
smain@google.com bf644aa564 remove the Helpouts recruitment banner
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
2014-12-16 10:05:03 -08:00
Joe Fernandez 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Joe Fernandez 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Joe Fernandez 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
smain@google.com 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
smain@google.com 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
smain@google.com 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
Michael Runge 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
Michael Runge 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
Michael Runge ea1dc69968 Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev 2014-12-15 21:35:19 +00:00
smain@google.com 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
smain@google.com 3de83c1bcd make shadowbox video always centered to fit the window height
Change-Id: I03f8ffac555dbbbbd5538fedf13413aca031fd74
2014-12-15 09:27:48 -08:00
Joe Fernandez 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
Joe Fernandez a441771265 Merge "docs: SHA update in sdkpage.cs" into lmp-docs 2014-12-13 00:43:10 +00:00
smain@google.com 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
Rich Slogar 8d3c694de1 docs: SHA update in sdkpage.cs
Change-Id: I2c94b1af228295a3650d17e2c00023e5b52ec1b9
2014-12-12 16:21:03 -08:00
smain@google.com 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
smain@google.com 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
smain@google.com d24088c08d add analytics event to track from which page a video was started
Change-Id: I9ba1f992c09fb9e18c55bca5bf3892e50f37012a
2014-12-12 11:37:22 -08:00
smain@google.com 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
smain@google.com 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
smain@google.com 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
David Friedman 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
smain@google.com 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
David Friedman 46c4bcdcb8 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 '13c3e7eb90ea8b2bed230dd91e79b0e3403c59fb':
  CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-09 23:15:05 +00:00
smain@google.com c1629a58a5 am 5d48286c: am 30aea34e: am 07c19f68: am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
* commit '5d48286c01a407c56d6fc13d666d7ead70e0d2a1':
  update sdk template with new studio downloads
2014-12-09 23:03:29 +00:00
Michael Runge e07c75a86b Rewrite ro.vendor.build.fingerprint/thumbprint on signing
This should also indicate release-keys.

Bug: 18281807

Change-Id: I8d2568ca346625b91384f7e639d9c92e97587755
2014-12-09 13:54:52 -08:00
smain@google.com 79ad9c786a am 8aebbf0d: am 0ecb5a68: add links to release notes
* commit '8aebbf0dbaf37b558307a9d794dfbb041ce55614':
  add links to release notes
2014-12-09 21:33:27 +00:00
David Friedman 03e066b759 am 83e96ca8: am 1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
* commit '83e96ca8c24256a989881d59d24f66d439c2f5f4':
  CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-09 21:33:17 +00:00
smain@google.com 8aebbf0dba am 0ecb5a68: add links to release notes
* commit '0ecb5a688e6a954e8296547e84e58959e30ccd4e':
  add links to release notes
2014-12-09 03:04:58 +00:00
Ying Wang dee5dff3f4 am c6f3273d: am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
* commit 'c6f3273db3fe5c09a93fa04e49c52d89a322d1b3':
  Add system propery ro.build.flavor.
2014-12-09 00:56:58 +00:00
David Friedman 83e96ca8c2 am 1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
* commit '1a0159f216076579d128d17dc8292904606a3420':
  CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117
2014-12-09 00:31:41 +00:00
smain@google.com 0ecb5a688e add links to release notes
Change-Id: I04be73254e6d9bd020e9dea5b7d46b92e17e8f31
2014-12-08 13:58:54 -08:00
David Friedman 1a0159f216 Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs 2014-12-08 19:55:47 +00:00
smain@google.com 5d48286c01 am 30aea34e: am 07c19f68: am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
* commit '30aea34eaed65032675c448be3534a070e1910b6':
  update sdk template with new studio downloads
2014-12-08 19:41:31 +00:00
smain@google.com f0a2e5eb86 am a324f898: am 3984cca2: am 79ac4384: am d53f0660: update to sdk page template for Android Studio downloads
* commit 'a324f898ccca57879e7478c1bbe0411533dcfbd9':
  update to sdk page template for Android Studio downloads
2014-12-08 19:39:57 +00:00
Rich Slogar 0e41ac7803 am 2305c8d9: am 8242ce83: am db8d79a9: am fe4dd526: docs: sdkpage update [CP]
* commit '2305c8d90c0fe0e57e4d0332749366ba5acde1a0':
  docs: sdkpage update [CP]
2014-12-08 19:39:49 +00:00
Ying Wang c6f3273db3 am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
* commit 'be66d9f09ada756a95a9efd3b67040a81b3322d1':
  Add system propery ro.build.flavor.
2014-12-08 19:12:15 +00:00
smain@google.com 07c19f6888 am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
* commit '87b1b5edb11644ac656a1d8df37201460289de94':
  update sdk template with new studio downloads
2014-12-08 07:17:54 +00:00
smain@google.com 87b1b5edb1 am 102db8b5: update sdk template with new studio downloads
* commit '102db8b58bd51aeaa7409924d5dc341f2f72b892':
  update sdk template with new studio downloads
2014-12-08 07:10:39 +00:00
smain@google.com 102db8b58b update sdk template with new studio downloads
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
2014-12-07 22:39:24 -08:00
smain@google.com 3984cca2a6 am 79ac4384: am d53f0660: update to sdk page template for Android Studio downloads
* commit '79ac4384637c77076f93307e61c8e2612df4a8cc':
  update to sdk page template for Android Studio downloads
2014-12-08 03:53:00 +00:00
smain@google.com 79ac438463 am d53f0660: update to sdk page template for Android Studio downloads
* commit 'd53f0660f1fe40921d72b75abb9bfeee534b6b8c':
  update to sdk page template for Android Studio downloads
2014-12-08 03:46:13 +00:00
smain@google.com d53f0660f1 update to sdk page template for Android Studio downloads
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
(cherry picked from commit 85fd6240cf)
2014-12-08 03:30:05 +00:00
Rich Slogar 8242ce83d1 am db8d79a9: am fe4dd526: docs: sdkpage update [CP]
* commit 'db8d79a9efefa4ba03a311904c4bf3b850f4f52b':
  docs: sdkpage update [CP]
2014-12-08 03:03:49 +00:00
Rich Slogar db8d79a9ef am fe4dd526: docs: sdkpage update [CP]
* commit 'fe4dd5263f344c5420780626410b84d7383e801d':
  docs: sdkpage update [CP]
2014-12-08 02:59:48 +00:00
Rich Slogar fe4dd5263f docs: sdkpage update [CP]
Change-Id: I06c8878c4b449a472a71f224a17bf9fef794de20
(cherry picked from commit 627f711a5d)
2014-12-06 09:11:32 +00:00
smain@google.com 4e8f4b6e33 Merge "update to sdk page template for Android Studio downloads" 2014-12-05 18:28:56 +00:00
smain@google.com 85fd6240cf update to sdk page template for Android Studio downloads
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
2014-12-04 18:16:10 -08:00
Ying Wang 27eba54b20 Add system propery ro.build.flavor.
ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in
system.img build.prop at build time,
and it won't be overridden by oem partition's build.prop.

Bug: 18605832
Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
2014-12-04 15:19:08 -08:00
smain@google.com 711b3e3e4c am 02af9d6d: am b8e8e522: am e217fc3c: am eee91eb2: am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '02af9d6dfdb1dcd35f3291d2a931265b886c57ad':
  new version of Helpouts recruit banner for TV and Wear
2014-12-03 21:51:53 +00:00
smain@google.com 02af9d6dfd am b8e8e522: am e217fc3c: am eee91eb2: am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit 'b8e8e522704f37ea5adc63cce9c34801bb10c42d':
  new version of Helpouts recruit banner for TV and Wear
2014-12-03 20:43:06 +00:00
smain@google.com e217fc3c3e am eee91eb2: am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit 'eee91eb24233fa0a14f2d273bebd18a4bcb87310':
  new version of Helpouts recruit banner for TV and Wear
2014-12-03 18:12:41 +00:00
smain@google.com eee91eb242 am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit 'd99989c558c384312bd63cf3a5e1bbbd799bf4b5':
  new version of Helpouts recruit banner for TV and Wear
2014-12-03 03:04:49 +00:00
smain@google.com d99989c558 Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs 2014-12-03 02:23:11 +00:00
smain@google.com 55bbab956b new version of Helpouts recruit banner for TV and Wear
Change-Id: I971e9043b60bdb925c2f648e0aff3de9d8c9cd81
2014-12-02 11:01:20 -08:00
smain@google.com 7fcb9209ac am b2eaef29: am bcca18bf: am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit 'b2eaef295633a3be2809c8040215f266e42d3a15':
  add support for shadowbox videos with start time specified with #t= in video url
2014-12-01 19:44:27 +00:00
smain@google.com b2eaef2956 am bcca18bf: am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit 'bcca18bfd87543ff8e21d9c892b3ac31bd8de82d':
  add support for shadowbox videos with start time specified with #t= in video url
2014-12-01 19:33:14 +00:00
smain@google.com 43fbdb2acb am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit 'dc8a05ca6922642851f93889f90052765a8a2fb6':
  add support for shadowbox videos with start time specified with #t= in video url
2014-11-27 10:08:54 +00:00
Clay Murphy 6da0217fc3 Merge "Docs: Updating the PDK for the L release." 2014-11-26 22:05:25 +00:00
smain@google.com 1ed2f9e26b am 8051e8b6: am 78860124: am d020c517: am 39343e30: am ccb54008: rev css version to clear browser caches
* commit '8051e8b6622fc984364668468d12c529cfb07cbf':
  rev css version to clear browser caches
2014-11-26 19:59:01 +00:00
smain@google.com ecd25aaba7 am 99114f48: am 42abb5fc: am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '99114f48796ae540ef29066989add021deafe0ff':
  move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 19:59:00 +00:00
smain@google.com 8051e8b662 am 78860124: am d020c517: am 39343e30: am ccb54008: rev css version to clear browser caches
* commit '788601245a41067f7f300357925ac7f2d92e86b2':
  rev css version to clear browser caches
2014-11-26 18:42:36 +00:00
smain@google.com 99114f4879 am 42abb5fc: am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '42abb5fc564e2735dff568d1833e23507e485564':
  move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 18:42:35 +00:00
smain@google.com dc8a05ca69 am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '570c2210b8ea16cc560e6b62ec06f8ad05fae9aa':
  add support for shadowbox videos with start time specified with #t= in video url
2014-11-26 11:56:55 +00:00
Scott Main 21a1981389 Merge "docs: sdkpage update" 2014-11-26 03:14:15 +00:00
smain@google.com 570c2210b8 add support for shadowbox videos with start time specified with #t= in video url
Change-Id: I165620326f44f8e95bb34a2b623e67fc3b7dcc50
2014-11-25 19:03:56 -08:00
smain@google.com d020c51752 am 39343e30: am ccb54008: rev css version to clear browser caches
* commit '39343e30796d4fbf3d6daa5869acdb71a9fb3a87':
  rev css version to clear browser caches
2014-11-26 00:59:47 +00:00
smain@google.com 17874347cc am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit 'b90e4792dea4271395e216a9d37c712572395003':
  move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 00:59:42 +00:00
smain@google.com 39343e3079 am ccb54008: rev css version to clear browser caches
* commit 'ccb540081ca5f1c69bb1b2721cab319b88f9dd94':
  rev css version to clear browser caches
2014-11-26 00:31:57 +00:00
smain@google.com b90e4792de am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '3a9d50e19d9789cffc0d3d398733d909ee2ee618':
  move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 00:27:58 +00:00
smain@google.com ccb540081c rev css version to clear browser caches
Change-Id: I46e04a02a0c010777ba01af28044999a1cbe1e10
2014-11-25 16:16:20 -08:00
smain@google.com 3a9d50e19d move the next/previous links in design docs up 25px to avoid overlap with long titles
Change-Id: I3428e4cf2959d0e171692d12d47e100b46b6733e
2014-11-25 13:35:45 -08:00
smain@google.com 54d46a7e6a am 449809f9: am 096d3031: am 39e4cfab: am f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '449809f9463310c8610b61b9f950c9eb601bb725':
  add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
2014-11-25 17:39:05 +00:00
smain@google.com 096d3031e3 am 39e4cfab: am f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '39e4cfabed45984b884975d1e6e9b351e93d9d4a':
  add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
2014-11-24 19:11:06 +00:00
smain@google.com 39e4cfabed am f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit 'f75ee21c34c199632815ad763b940ad0fc63f8ea':
  add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
2014-11-24 19:02:36 +00:00
smain@google.com f75ee21c34 add analytics event tracking for shadowbox player and
rig the 'notice-developers-video' style links to also use shadowbox for video playback

Change-Id: Ib48a7c5243ad926345ce9ae9bd572d59aea035f4
2014-11-24 10:47:07 -08:00
Michael Runge 3deca9e5df am f3761585: am 60f56e7d: am 996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit 'f37615859e369c774841eafdb225a5f02259e1ee':
  Add support for tuning partitions
2014-11-24 18:06:36 +00:00
smain@google.com be24a29343 am e7b99103: am cf6ecd9f: am 2a87b781: am 698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit 'e7b991039c9d5590abe8e242e46e9afb3f5e0848':
  add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
2014-11-24 18:05:18 +00:00
Michael Runge 60f56e7d15 am 996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '996d8f48a1b3e6e3a63344633546ff294cc67071':
  Add support for tuning partitions
2014-11-24 02:37:02 +00:00
smain@google.com cf6ecd9f90 am 2a87b781: am 698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '2a87b7817d1eedf0ffcc112d3dc951392a465a2e':
  add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
2014-11-22 00:25:15 +00:00
Michael Runge 996d8f48a1 Merge "Add support for tuning partitions" into lmp-sprout-dev 2014-11-21 23:40:36 +00:00
David Friedman 40e3bece36 CSS change changing default from "Using Eclipse" to "Using Android Studio"
Bug 16679117

Change-Id: I21e4546775114355d04d09888eff21877b5bcab8
2014-11-21 13:36:52 -08:00
smain@google.com 2a87b7817d am 698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '698fff028ab6e58c45c7356922beaa7c6a2e9006':
  add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
2014-11-21 21:06:06 +00:00
smain@google.com 698fff028a add style and script to play videos in a shadowbox
anytime that a link appears in the page with class "video-shadowbox-button"
the link must also have the youtube video set in the href with the ?v parameter

Change-Id: I4af84f003075b8d2c43acd3295ce3955b141cc97
2014-11-21 09:56:42 -08:00
Dirk Dougherty d955a0cb88 am d4a50497: am a38ca021: am 8c657dc2: am b87e3000: Support langs.
* commit 'd4a50497bdbf23e3458757b90f1f40b727cd3441':
  Support langs.
2014-11-21 10:46:29 +00:00
Dirk Dougherty a38ca02145 am 8c657dc2: am b87e3000: Support langs.
* commit '8c657dc214ef430d57c6e0483e25eb6faf7a5619':
  Support langs.
2014-11-21 10:37:02 +00:00
Michael Runge 3e286645ba Add support for tuning partitions
Allow a simple mechanism to call tune2fs to modify an existing
partition without reformatting.

Bug: 18430740
Change-Id: I9210355b6bfec74d002d1f40b930330740f379a5
2014-11-21 00:46:03 -08:00
Clay Murphy a9c580f35b Docs: Updating the PDK for the L release.
Bug: 15922803
Change-Id: Ic7be744b7e79209d107375eac1a7e89b108a1b47

Conflicts:
	tools/droiddoc/templates-pdk/components/masthead.cs
2014-11-20 18:00:52 +00:00
Dirk Dougherty 8c657dc214 am b87e3000: Support langs.
* commit 'b87e300056f2141c80f0cf895af0c1bc708a3542':
  Support langs.
2014-11-20 00:03:25 +00:00
Dirk Dougherty b87e300056 Support langs.
Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
2014-11-19 23:31:03 +00:00
Ying Wang e91b83d5e6 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740

(cherry picked from commit f3b86357e2)

Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
2014-11-19 13:48:30 -08:00
Ying Wang f1021dcb61 am 6ead56be: am f3b86357: Support journal size board config variables.
* commit '6ead56bed56e3927575726bdebf8511e44f6fb47':
  Support journal size board config variables.
2014-11-19 19:28:23 +00:00
Ying Wang f3b86357e2 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740
Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
2014-11-18 18:19:43 -08:00
smain@google.com 4f397f0b0f am ff62239b: am 2e216835: am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit 'ff62239b026fb2635ffc6bdd3f0ad79d0fab2ee7':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:47:18 +00:00
smain@google.com 2e216835ee am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit '9220b6e676aefe152540a6cf832e5fd18817370e':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:39:39 +00:00
smain@google.com 0dd70276f6 am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit '6bdcb981ce098cae2fb9e690485ebaab47b2225a':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:30:31 +00:00
smain@google.com 6bdcb981ce followup to recent cookie max-age change to remove parameter and use 2-year for all cookies
bug: 17781603

Change-Id: Id0da9d41e01c6a45672d1362fc1c5aa39e558904
2014-11-14 11:53:07 -08:00
Ying Wang 8cbb0eac18 am 5520d930: Merge "sign_target_files_apks: fix recovery patch generation"
* commit '5520d930c8e78a3bea4eeba9d0430d1c3f19dba8':
  sign_target_files_apks: fix recovery patch generation
2014-11-14 19:01:35 +00:00
Ying Wang 5520d930c8 Merge "sign_target_files_apks: fix recovery patch generation" 2014-11-14 18:53:57 +00:00
Michael Runge 353bf5aab6 am b5d7011d: am 100a9f07: am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit 'b5d7011d78ddb71813db4f47134a63c84c502381':
  Allow images to be readded to target-files
2014-11-14 07:29:43 +00:00
Michael Runge 100a9f0720 am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '11d210154d71a229e20eaebd6f9ea580b0c7f036':
  Allow images to be readded to target-files
2014-11-14 07:19:58 +00:00
Michael Runge f178d36441 Merge "Allow images to be readded to target-files" into lmp-dev 2014-11-14 07:14:48 +00:00
Michael Runge 2e0d8fcf08 Allow images to be readded to target-files
There may be cases where various partitions were
modified (such as extra signing of boot/recovery)
which require the system partition to be regenerated
with a new recovery patch script.  Allow a request
for the recovery patch to be rebuilt, and for
missing images to be readded to the existing images.

Change-Id: Ie93c5bc1161a0d5002002dca23e07742ce2ba468
2014-11-13 22:55:35 -08:00
Paul Lawrence fb4415934c am 9ebb0067: am a37b2bb2: Fix the build
* commit '9ebb00679946cda44c5abdadaafa6c45b2cdcb29':
  Fix the build
2014-11-14 02:18:23 +00:00
Paul Lawrence a37b2bb236 Fix the build
Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
2014-11-14 02:04:33 +00:00
Sami Tolvanen 5132315546 am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
  DO NOT MERGE: Change verity key formats
2014-11-14 00:03:51 +00:00
Sami Tolvanen 8d212ea873 DO NOT MERGE: Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Bug: 15984840
Bug: 18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit 72d90eb189)
2014-11-13 23:23:31 +00:00
Yabin Cui b4157cd7c5 am d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit 'd3d6c3830f2c1b25f97a8e0001edfda4583a309a':
  kill HAVE_LOCALTIME_R
2014-11-13 20:09:30 +00:00
Yabin Cui e9ae59b47f kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
2014-11-13 11:51:37 -08:00
Andrew Boie d083f0b72f sign_target_files_apks: fix recovery patch generation
When rebuilding recovery, the boot images created for patching
purposes still were being signed with the old verity key and
not the new one specified on the command line.

In addition, the replacement verity public key in the boot ramdisk
wasn't being used.

Change-Id: I451e17d1cf08c507580c4b58134c1069532740e8
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-11-11 22:17:11 -08:00
Elliott Hughes 499ed6c496 am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
  Remove HAVE_DIRENT_D_TYPE.
2014-11-11 00:07:17 +00:00
Elliott Hughes 07793e1880 Remove HAVE_DIRENT_D_TYPE.
Only Windows doesn't have it, and we don't build atree for Windows.

Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
2014-11-10 15:33:39 -08:00
Dirk Dougherty 2aafb738e3 am f093a88f: am be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush. automerge: eb83a3e
* commit 'f093a88f26edc129db7caadae4dfbc45ffede995':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-07 00:08:47 +00:00
Dirk Dougherty eb83a3ed74 am be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
* commit 'be9f16d08b7cec10ac5c3dba93291db404be27f8':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 20:34:22 +00:00
Dirk Dougherty 48a97e0139 am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
* commit '87e469ea87a7a3b3142f1d2efd89d602a3ede529':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 05:14:27 +00:00
Dirk Dougherty 87e469ea87 Doc change: increment query params for js metadata files to trigger proxy flush.
Change-Id: Ic6f5756d44f1ec08485ac67a0258a4abae845222
2014-11-05 20:11:23 -08:00
Rich Slogar 627f711a5d docs: sdkpage update
Change-Id: I06c8878c4b449a472a71f224a17bf9fef794de20
2014-11-04 16:51:32 -08:00
smain@google.com c8a36b6130 am 977394ab: am bc13779d: hide the Helpouts recruitment banner automerge: 69d8f2d
* commit '977394ab77e6a505956fc7ad277c48fa9ed87450':
  hide the Helpouts recruitment banner
2014-11-04 03:16:34 +00:00
smain@google.com 69d8f2d395 am bc13779d: hide the Helpouts recruitment banner
* commit 'bc13779d664a51efc0fb9ac489d2724cca2536fb':
  hide the Helpouts recruitment banner
2014-11-04 02:38:42 +00:00
smain@google.com 632070c940 hide the Helpouts recruitment banner
Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953
(cherry picked from commit bc13779d66)
2014-11-04 02:30:38 +00:00
smain@google.com bc13779d66 hide the Helpouts recruitment banner
Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953
2014-11-03 18:28:17 -08:00
Dirk Dougherty 94ed49c75e am eb75cdae: am 04a95647: am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit 'eb75cdae67975ed183493fff96ae398a36e74bea':
  Doc change: increment the json import versions in docfile.
2014-11-03 22:35:52 +00:00
smain@google.com 40ddbc9537 am 7885c30d: am de5dc9a5: am f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603
* commit '7885c30d761d5769d1e55742a762d5535b18894c':
  remove cookie expiration and add max-age of 2 years. bug: 17781603
2014-11-03 22:31:33 +00:00
Dirk Dougherty 04a9564759 am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '792fb0e6b29a9adfb3705d2fa993f3af27c267a7':
  Doc change: increment the json import versions in docfile.
2014-11-03 21:11:04 +00:00
Dirk Dougherty 792fb0e6b2 am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '4244929faaaffe957e8f23f3f261fd3acdbc928c':
  Doc change: increment the json import versions in docfile.
2014-11-03 20:57:01 +00:00
Dirk Dougherty 4244929faa Merge "Doc change: increment the json import versions in docfile." into lmp-docs 2014-11-03 20:51:47 +00:00
Dirk Dougherty f6e48da07f Doc change: increment the json import versions in docfile.
Change-Id: I5ffd1810c83a333ae37e5d9c1b8dd0bdbd8cb376
2014-11-03 12:48:08 -08:00
smain@google.com de5dc9a564 am f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603
* commit 'f51f30d7f10a32e07a081b799d9ae601be08276c':
  remove cookie expiration and add max-age of 2 years. bug: 17781603
2014-11-03 19:57:38 +00:00
smain@google.com 80e38f4872 remove cookie expiration and add max-age of 2 years.
bug: 17781603

Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
(cherry picked from commit f51f30d7f1)
2014-11-03 19:40:48 +00:00
smain@google.com f51f30d7f1 remove cookie expiration and add max-age of 2 years.
bug: 17781603

Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
2014-11-03 11:39:00 -08:00
Dirk Dougherty 7b562067a8 am 7d25b7d3: am b6dfc2d2: am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
* commit '7d25b7d346a6b855f708d90236aeee59ba6ddbe2':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
2014-11-03 18:03:48 +00:00