Commit graph

3023 commits

Author SHA1 Message Date
Dirk Dougherty
cbe032f87a Sync style changes from external (sync3).
Change-Id: I590557ccc3bde1172e80f5a9bc0a2be2f30e23b8
2015-05-22 13:20:16 -07:00
Dirk Dougherty
4475fda037 am 4620dbd5: am cf7a3b9e: Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
* commit '4620dbd5903c2b84181e0fec16615d995b8e8556':
  Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
2015-05-22 18:16:16 +00:00
Dirk Dougherty
4620dbd590 am cf7a3b9e: Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
* commit 'cf7a3b9eb3e17f19ec598e1d77f5bc74751295ac':
  Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
2015-05-22 17:28:34 +00:00
Dirk Dougherty
cf7a3b9eb3 Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
Change-Id: Iade5ac4630c9e763c377ab5749f16832e3ba47b7
2015-05-22 09:42:35 -07:00
Adam Powell
0d007cf6d0 Merge "Initialize ro.build.version.preview_sdk" into mnc-dev 2015-05-21 22:17:41 +00:00
Adam Powell
bdd5e8e7fe Initialize ro.build.version.preview_sdk
Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
2015-05-21 13:49:05 -07:00
Tao Bao
58c1b96165 Fix the permission setting in common.ZipWriteStr()
When passing a ZipInfo instance to common.ZipWriteStr(), the
external_attr attribute should not be overwritten unless specified.
We didn't have the issue previously because we were calling
ZipFile.writestr() directly until [1] merged.

[1] commit 2ed665a033.

Bug: http://b/21309935
Change-Id: I8c0190362c60d7d78965ecfe5e484f8398ddc5f2
(cherry picked from commit 9773465409)
2015-05-20 13:29:03 -07:00
Dirk Dougherty
fd2d4fc975 am 9cf9a6c6: am a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '9cf9a6c6dcd9d58024dc115a703feb7bc47098bd':
  Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
2015-05-18 18:49:35 +00:00
Dirk Dougherty
9cf9a6c6dc am a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit 'a8bbfca3d0ba7da40f9348eeb38badda575fe411':
  Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
2015-05-16 00:32:01 +00:00
Dirk Dougherty
a8bbfca3d0 Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Change-Id: I80124a8a05311976a7c373dfdaf5bb984a9c3bc7
2015-05-15 17:05:38 -07:00
Tao Bao
1a833d24c4 Merge "Add support for clobbered blocks" into mnc-dev 2015-05-14 21:54:21 +00:00
David Friedman
8025e2854e am 802f05f0: am 2f9407e1: am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '802f05f0e47ab15955b0c460db0c751b982a6f34':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-14 00:00:12 +00:00
David Friedman
802f05f0e4 am 2f9407e1: am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '2f9407e197242eb3a9db188f901369e09e11a152':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:46:38 +00:00
David Friedman
2f9407e197 am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit 'f004b1149db26f24188eeaa1fe65a4743c4e9b31':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:30:43 +00:00
David Friedman
f004b1149d am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '302e2f9cb58de33c529b6ac02421fb0b63b7fcb0':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:16:45 +00:00
Dirk Dougherty
02a8026143 am 7a72fdd4: am f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit '7a72fdd4e46c907c7deac8e6cd75df156ec244f0':
  Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
2015-05-13 21:44:39 +00:00
Dirk Dougherty
7a72fdd4e4 am f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit 'f97b2ef21a9940ec7a41c9116a79f9b2a36e0c1d':
  Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
2015-05-13 21:34:56 +00:00
Dirk Dougherty
f97b2ef21a Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
Change-Id: I6e33dd10e1c9e8b378080464b4b70ac6b10df8b7
2015-05-13 13:54:09 -07:00
Tao Bao
5ece99d64e Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.

Bug: http://b/20939131
Change-Id: I657025b7b1ad50d4365e7b18dc39308facfe864e
(cherry picked from commit ff7778166b)
2015-05-13 12:26:04 -07:00
David Friedman
302e2f9cb5 Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download
option.

Change-Id: I6ac64b6a2e0f4cca75e043c92a7e0e2395fe71de
2015-05-13 07:10:22 -07:00
Tao Bao
f3282b4a7f Wrap zipfile.write(), writestr() and close()
In order to work around the zip 2GiB limit, we need to wrap the related
functions in zipfile. Calls to those functions should always be replaced
with calls to the wrappers instead.

Bug: 18015246
Change-Id: I499574cee51ec4804bc10cbefe0b17940afed918
(cherry picked from commit 2ed665a033)
2015-05-08 15:53:27 -07:00
Joe Fernandez
ad79cc6741 am c4ef9bb0: am a9d796a4: docs: Add navigation heading for Develop > Preview
* commit 'c4ef9bb08f504c3ca58727403f607cd051edbf5d':
  docs: Add navigation heading for Develop > Preview
2015-05-07 06:42:07 +00:00
Joe Fernandez
c4ef9bb08f am a9d796a4: docs: Add navigation heading for Develop > Preview
* commit 'a9d796a4f9e198f17de6f1a27264b1b4fc9a778a':
  docs: Add navigation heading for Develop > Preview
2015-05-07 06:29:59 +00:00
Joe Fernandez
a9d796a4f9 docs: Add navigation heading for Develop > Preview
Change-Id: I133672c6ecb5e778f49c31d091812ed7b6dc6b24
2015-05-06 22:24:31 -07:00
Dirk Dougherty
0717cb2251 am e94fcf31: am 29e93436: Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
* commit 'e94fcf31a08a7cce45171b5f8cce29b50d2cefd8':
  Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
2015-05-06 17:13:01 +00:00
Dirk Dougherty
e94fcf31a0 am 29e93436: Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
* commit '29e934367b927fb13417bee77008600ad5a39dcc':
  Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
2015-05-06 17:00:22 +00:00
Dirk Dougherty
29e934367b Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
Change-Id: I9eabbbcd823fb29bd2209172c458cb9dad5f24d2
2015-05-05 18:17:13 -07:00
Dirk Dougherty
5c73ba6e03 am e99d5320: am 032a4946: Doc change: css/js, assets for landing page, header/footer designs.
* commit 'e99d5320dd70de6f5ada67dd0c2dd9761e6a6c32':
  Doc change: css/js, assets for landing page, header/footer designs.
2015-05-05 02:35:03 +00:00
Dirk Dougherty
e99d5320dd am 032a4946: Doc change: css/js, assets for landing page, header/footer designs.
* commit '032a494654978c3ceed73268f99615ff3d0d686e':
  Doc change: css/js, assets for landing page, header/footer designs.
2015-05-05 02:23:28 +00:00
Dirk Dougherty
3c339ae4fd am 55abf4c2: am ff233cc9: Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
* commit '55abf4c22d08693cfb2838a79654fc32c7de3ff8':
  Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
2015-05-05 01:48:10 +00:00
Dirk Dougherty
032a494654 Doc change: css/js, assets for landing page, header/footer designs.
Change-Id: I9430a725bd7ba12cb0ac7da1a5ed9c3bfa8e321e
2015-05-04 18:17:33 -07:00
Dirk Dougherty
55abf4c22d am ff233cc9: Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
* commit 'ff233cc92e379d501d8b256ba9a015827d77e012':
  Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
2015-05-05 01:04:31 +00:00
Joe Fernandez
6f7608cf8f am 657b2971: am fa6ee37f: am 53b98761: docs: fix sticky header hiding RenderScript reference headings
* commit '657b2971f8a6f4a1b6dac68915c557304970d716':
  docs: fix sticky header hiding RenderScript reference headings
2015-05-04 22:19:28 +00:00
Joe Fernandez
c135a7f993 am 63904d26: am 03b107c8: docs: update masthead template for Preview docs
* commit '63904d26ad473d8446fea12775ef37e9ae2c8e59':
  docs: update masthead template for Preview docs
2015-05-04 22:19:27 +00:00
Dirk Dougherty
ff233cc92e Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
Change-Id: I5a94aaa8ba375010191a12f210954c22395fed40
2015-05-04 14:37:05 -07:00
Joe Fernandez
657b2971f8 am fa6ee37f: am 53b98761: docs: fix sticky header hiding RenderScript reference headings
* commit 'fa6ee37fae42ef08ebcb63dcaf8122f0f6f5311a':
  docs: fix sticky header hiding RenderScript reference headings
2015-05-01 23:14:51 +00:00
Joe Fernandez
fa6ee37fae am 53b98761: docs: fix sticky header hiding RenderScript reference headings
* commit '53b98761b288fcf833db62bb4700fba20b319961':
  docs: fix sticky header hiding RenderScript reference headings
2015-05-01 23:05:35 +00:00
Mohamad Ayyash
95e74c1424 common.py: Add support for squashfs
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-05-01 15:58:42 -07:00
Joe Fernandez
63904d26ad am 03b107c8: docs: update masthead template for Preview docs
* commit '03b107c8563c5edf5fe25435e609329d1fc7a62f':
  docs: update masthead template for Preview docs
2015-05-01 22:57:46 +00:00
Joe Fernandez
03b107c856 docs: update masthead template for Preview docs
Change-Id: I00ec56064a5193491fce5389cdff7cb5824e567c
2015-05-01 15:45:32 -07:00
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