Commit graph

2470 commits

Author SHA1 Message Date
Raph Levien
fed4c5ca5a Merge "Add Zopfli-recompress option to zipalign" 2014-07-10 20:54:59 +00:00
Elliott Hughes
45a45d611f am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
  ADBS now uses stack_core code to parse traces.
2014-07-09 01:28:20 +00:00
Elliott Hughes
a97f675c92 am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '1b1840cbef77f2abfe95af56bc927c647a693429':
  ADBS now uses stack_core code to parse traces.
2014-07-08 20:15:39 +00:00
Raph Levien
093d04c631 Add Zopfli-recompress option to zipalign
Zopfli provides compression roughly 5% better than zlib, while remaining
completely compatible with zlib decoders. This patch adds a "-z" option
to zipalign, recompressing all compressed files within the zip archive.

Change-Id: If177ca4b82ec701b7446861b2cfe08c6bd403813
2014-07-07 16:03:49 -07:00
Brigid Smith
90c66cff3a ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang
00c67a0568 Fix typo.
Bug: 15978907
Bug: 15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
2014-06-30 18:01:46 -07:00
JP Abgrall
1207d5e02b Merge "releasetools: only allow yaffs to have no userdata image size (fix build)" 2014-06-27 15:56:14 +00:00
JP Abgrall
4d09dcb2c6 releasetools: only allow yaffs to have no userdata image size (fix build)
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.

Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-26 21:15:39 -07:00
Dirk Dougherty
80b97e1c19 am 23673843: Doc change: add query param to force refresh in proxy caches.
* commit '236738439acab7c9b2afc2725b44c4867597ed7f':
  Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:09:09 +00:00
Dirk Dougherty
236738439a Doc change: add query param to force refresh in proxy caches.
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
Colin Cross
d00c0a2e20 HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.

Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Dirk Dougherty
43da4342d2 am 80b97e1c: am 23673843: Doc change: add query param to force refresh in proxy caches.
* commit '80b97e1c193687d74a93e9f9b365ba11838817df':
  Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:14:40 +00:00
Robert Ly
3cbf635856 am 13c416be: am 28d695a0: css changes for index page card
* commit '13c416be55329150bbfefe2a51ae05c8c832db84':
  css changes for index page card
2014-06-26 10:31:01 +00:00
Robert Ly
4e8b404300 am 8a782585: am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
* commit '8a78258526e49957d285c48ddba5a8de64774256':
  docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 10:31:00 +00:00
Robert Ly
13c416be55 am 28d695a0: css changes for index page card
* commit '28d695a0051af88d72cd025cdd3df01ae5fffed1':
  css changes for index page card
2014-06-26 09:50:21 +00:00
Robert Ly
8a78258526 am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
* commit 'a34ef028a00192877209281490a468c29cdacd40':
  docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 09:49:40 +00:00
Robert Ly
28d695a005 css changes for index page card
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
2014-06-25 22:50:49 -07:00
smain@google.com
bd7b23e403 am 0858c65a: am 5771ee3c: add style for stand-alone back link with left arrow
* commit '0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc':
  add style for stand-alone back link with left arrow
2014-06-25 23:21:00 +00:00
smain@google.com
0858c65a4d am 5771ee3c: add style for stand-alone back link with left arrow
* commit '5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
  add style for stand-alone back link with left arrow
2014-06-25 22:23:02 +00:00
smain@google.com
5771ee3c41 add style for stand-alone back link with left arrow
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
2014-06-25 15:12:52 -07:00
smain@google.com
4bc8177434 am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
  undo the butterbar change, because automerger is ruthless
2014-06-25 20:45:52 +00:00
smain@google.com
e022e9a713 am bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit 'bb9ecf420f136681a3bd4d5503207733b4dc283b':
  undo the butterbar change, because automerger is ruthless
2014-06-25 19:12:42 +00:00
Clay Murphy
0e9f646d39 Merge "Docs: Replacing s.a.c. Android logo to match other sites." 2014-06-25 17:34:07 +00:00
smain@google.com
bb9ecf420f undo the butterbar change, because automerger is ruthless
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
2014-06-24 18:43:36 -07:00
smain@google.com
0b65bf6b1b am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
  DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:27:58 +00:00
smain@google.com
e401cf2c7f am c26839a9: am cfb92aa9: add a smaller version of the device frame for wear
* commit 'c26839a901a1ea395a62bb82407c1316e281c52a':
  add a smaller version of the device frame for wear
2014-06-25 00:27:54 +00:00
smain@google.com
58b617b902 am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit 'cd59b7dfdb392153422f5618e2d6e847dcff790b':
  DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:24:34 +00:00
smain@google.com
cd59b7dfdb am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '5f6019ab6cdcb3000eaf4b695424361a5038ade9':
  DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:19:46 +00:00
smain@google.com
5f6019ab6c DO NOT MERGE
add butterbar notice for the google IO SDK announcements

Change-Id: I25bbb0ee4cab95b0c26cd2bd517e490e44ae1465
2014-06-24 17:11:13 -07:00
smain@google.com
c26839a901 am cfb92aa9: add a smaller version of the device frame for wear
* commit 'cfb92aa963f2fee3251c393bc6dcff9b194af3e1':
  add a smaller version of the device frame for wear
2014-06-24 21:14:30 +00:00
smain@google.com
cfb92aa963 add a smaller version of the device frame for wear
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
2014-06-24 11:58:16 -07:00
Clay Murphy
6bc672aa96 Docs: Replacing s.a.c. Android logo to match other sites.
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-06-24 11:32:56 -07:00
smain@google.com
cf1c266e1f am 47f94218: am abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
* commit '47f942184e61f830c8045db16d1ca692677e7f59':
  more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
2014-06-24 14:00:39 +00:00
smain@google.com
3f1d3a04f2 am 9db3d88c: am daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'
* commit '9db3d88c34563f8f92fcefb66bd67da3a9661064':
  update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
2014-06-24 14:00:38 +00:00
smain@google.com
47f942184e am abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
* commit 'abf34118c3bf14bd4acfde657b3ef8b1fb913bea':
  more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
2014-06-24 13:55:13 +00:00
smain@google.com
9db3d88c34 am daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'next\' link in
* commit 'daa9e205bb7e0d1b0866f0ce919af7749388120f':
  update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
2014-06-24 13:55:12 +00:00
Robert Ly
a34ef028a0 Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev 2014-06-24 08:05:46 +00:00
Ricardo Cervera
94dcf1c7cf docs: Updating download dir for ADT 23.0.0 links to new location
Change-Id: Ief0351a902366d0a6ddc5488cb5b6c900c0350e9
2014-06-25 14:45:14 -07:00
smain@google.com
abf34118c3 more tweaks fixes to the next/prev logic. Fix the way 'articles'
include the links. was broken for design docs, all appeared disabled.
also add 'white' style for links that appear on colored background

Change-Id: I6f59b91c1429014a90cb887a9e46880ebde0f75a
2014-06-23 11:47:12 -07:00
smain@google.com
daa9e205bb Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set." into klp-modular-dev 2014-06-23 17:14:09 +00:00
smain@google.com
c91ecb7093 update the wear device frame style. rename and make frame part of css.
also update some logic with next/prev links to make navigation prev
possible while in design docs (or others that allow cross-boundary nav)
and simply remove the 'next' link in the footer when at the end of a set.

Change-Id: I83008e313fb07c9bc028e27c06e0e8478fa525f0
2014-06-23 10:42:07 -07:00
Robert Ly
60a69946da am 69a08861: fix preview link
* commit '69a0886170560d76fe402cf21a99119689aa3a0a':
  fix preview link
2014-06-23 09:56:06 +00:00
Robert Ly
69a0886170 fix preview link
Change-Id: Ia4f409471e0c62b365fab7dba598e8bee690f0c3
2014-06-22 23:17:33 -07:00
smain@google.com
694b1a9a1b am ebed3b85: Merge "new android logo for preview docs header" into klp-modular-dev
* commit 'ebed3b8595b141de1ad8f282c52284dca1e72e19':
  new android logo for preview docs header
2014-06-21 20:15:55 +00:00
Robert Ly
3c3dc7bea9 am 60a69946: am 69a08861: fix preview link
* commit '60a69946da1904ee75d3ed615f8dbb81ef229d6d':
  fix preview link
2014-06-23 10:42:00 +00:00
smain@google.com
861b003771 am 694b1a9a: am ebed3b85: Merge "new android logo for preview docs header" into klp-modular-dev
* commit '694b1a9a1b22ee50c81b0e5be92fe0c7500c6a86':
  new android logo for preview docs header
2014-06-21 20:19:17 +00:00
smain@google.com
a076aed179 am 1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit '1ac633c4c835b814545532ea71e230a5fd93cc1d':
  fix vertical spacing following collection
2014-06-20 22:30:39 +00:00
smain@google.com
19194e2a23 am eb01827b: reverse the blue button hover state color
* commit 'eb01827bef34ebbe8d867ec32a42b31e3c3f8abc':
  reverse the blue button hover state color
2014-06-20 22:30:21 +00:00
smain@google.com
d357cc2f01 am baf5b60b: make primary landing button dark red
* commit 'baf5b60b1242710867878b350595cb98a9511b61':
  make primary landing button dark red
2014-06-20 22:30:20 +00:00
smain@google.com
b07a681e9e am cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
* commit 'cda1a9a756cbe694fda94687eccf64fdabb8c775':
  add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
2014-06-20 22:29:58 +00:00
smain@google.com
ebed3b8595 Merge "new android logo for preview docs header" into klp-modular-dev 2014-06-20 21:00:34 +00:00
smain@google.com
13f0a0bf0f new android logo for preview docs header
Change-Id: I80a35bcbdb55c50a445e061212e32ed2361f983c
2014-06-20 16:54:50 -07:00
smain@google.com
95c0d99f75 fix vertical spacing following collection
Change-Id: I50ec016d646a8fd92cf1f85a844cb6f3bf96cf79
2014-06-20 10:22:38 -07:00
smain@google.com
eb01827bef reverse the blue button hover state color
Change-Id: Ib3b8abcd9683eda3b9a69f0c0ba1d53228191540
2014-06-19 22:54:07 -07:00
smain@google.com
baf5b60b12 make primary landing button dark red
Change-Id: I2d515991ccdca79a28ee1ebe7706e8fbc3afc57e
2014-06-19 22:24:44 -07:00
smain@google.com
cda1a9a756 add "static" class to allow hand-written version of collection card for the homepage
and add "no-section" override to resource widget to enable title+description only card layout
and make the landing-secondary button blue

Change-Id: I4432c2ff267c20cb64f9c87524560b2d779c9e91
2014-06-19 18:24:28 -07:00
smain@google.com
204744526c am a076aed1: am 1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit 'a076aed1791cb86dee663c854315de5751462b90':
  fix vertical spacing following collection
2014-06-20 22:33:35 +00:00
smain@google.com
c7710705db am 19194e2a: am eb01827b: reverse the blue button hover state color
* commit '19194e2a23d5d2e6c58a0126532d6c5a5f5c1ffc':
  reverse the blue button hover state color
2014-06-20 22:33:34 +00:00
smain@google.com
b6d4185317 am d357cc2f: am baf5b60b: make primary landing button dark red
* commit 'd357cc2f011e9c9e361ec59482db9bce21198e43':
  make primary landing button dark red
2014-06-20 22:33:33 +00:00
smain@google.com
971188d104 am b07a681e: am cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
* commit 'b07a681e9ed1c5bc6f06880eee8e39304fea6b56':
  add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
2014-06-20 22:33:32 +00:00
smain@google.com
1ac633c4c8 Merge "fix vertical spacing following collection" into klp-modular-dev 2014-06-20 00:20:03 +00:00
smain@google.com
f82118195e am b8281c70: add new preview watermark for docs
* commit 'b8281c70915cc296d7083f46811850e6888ffdf3':
  add new preview watermark for docs
2014-06-19 17:49:18 +00:00
smain@google.com
b8281c7091 add new preview watermark for docs
Change-Id: Idd63395b6b53674d0db87fbbcf37eb4864accacd
2014-06-19 10:44:03 -07:00
Ying Wang
240e136efd am 318c8e76: am 17c6426e: Merge "Document the worker_threads option."
* commit '318c8e76ee8f47fb9f077e419713cf4dbb454788':
  Document the worker_threads option.
2014-06-19 17:16:39 +00:00
smain@google.com
873234bd7a am 38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '384041992c734be6ec8d2469d071c3358fd15a77':
  revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
2014-06-18 16:34:40 +00:00
smain@google.com
5c14a0f761 am f8211819: am b8281c70: add new preview watermark for docs
* commit 'f82118195ec77a415d48220eaf87abad754e31bc':
  add new preview watermark for docs
2014-06-19 17:54:46 +00:00
Ying Wang
f5770d78da resolved conflicts for merge of 240e136e to master
Change-Id: Ic6e2cbe593914ddb613454581964c5d3d443b9d5
2014-06-19 10:32:35 -07:00
smain@google.com
96b5596721 am 873234bd: am 38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '873234bd7a188b46ec34c726a3962e70e4ff2f3a':
  revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
2014-06-18 16:39:17 +00:00
smain@google.com
5bc3a1acb0 revisions to the next/prev page link layout.
make "next" link in footer align left, remove previous link in footer,
add doc title to next link in footer, move g+ to the right

Change-Id: Id7c18a1a1a42344e96d0fa17c35908eb87d62612
2014-06-17 20:02:53 -07:00
JP Abgrall
5bfed5a320 core+tools: support specifying F2FS as the fstype for userdata
- Support TARGET_USERIMAGES_USE_F2FS.
- Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE.
- Support "userdata_fs_type" in the prop dict.
- Update build_image to recognize f2fs and call the correct command.

Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 13:32:14 -07:00
smain@google.com
fa785c0a8a am 95f3f029: am 3b77ab5a: fix xss vulnerabilities bug: 15597152 bug: 15405607
* commit '95f3f0296be2842948f0c0262a067e69dcd77f6f':
  fix xss vulnerabilities bug: 15597152 bug: 15405607
2014-06-17 19:12:37 +00:00
smain@google.com
95f3f0296b am 3b77ab5a: fix xss vulnerabilities bug: 15597152 bug: 15405607
* commit '3b77ab5a01f1c3297bed32d9c7fac68a61bf3d20':
  fix xss vulnerabilities bug: 15597152 bug: 15405607
2014-06-17 19:07:05 +00:00
smain@google.com
3b77ab5a01 fix xss vulnerabilities
bug: 15597152
bug: 15405607

Change-Id: I10582d5cd767b977fc2af0f2cf2642802feeffab
2014-06-17 11:57:27 -07:00
Doug Zongker
3fd79a352e Merge "full support for OTA of vendor partitions" 2014-06-17 03:47:23 +00:00
smain@google.com
b75b32830c am 5c1d21b4: am 95948b88: add script and style for toggling which IDE instructions to show.
* commit '5c1d21b458880bcc466bc353bc9afbef8e439afc':
  add script and style for toggling which IDE instructions to show.
2014-06-17 03:28:49 +00:00
smain@google.com
5c1d21b458 am 95948b88: add script and style for toggling which IDE instructions to show.
* commit '95948b88ec17e5b0f5b9cdcc43b08989cec2a34a':
  add script and style for toggling which IDE instructions to show.
2014-06-17 03:24:12 +00:00
smain@google.com
95948b88ec add script and style for toggling which IDE instructions to show.
Change-Id: Ief094a4f58c7ebb4625948d6639fed713adcc0c7
2014-06-16 19:25:14 -07:00
Doug Zongker
c8b4e849f1 full support for OTA of vendor partitions
Make vendor partition a first-class member of the OTA system (for
target_files that contain a VENDOR/ subdirectory).

Build vendor images in a way that is compatible with block-based OTA.
Support updating the vendor partition in both full and incremental,
block and file OTAs.  In most cases this is handled by refactoring the
existing code to handle the system partition to handle either, and
then calling it twice.

Currently we don't support incremental OTAs from a target-files
without a VENDOR subdirectory to one with one, or vice versa.  To add
or remove a vendor partition a full OTA will need to be done.

Bug: 15544685
Change-Id: I9cb9a1267060bd9683a9bea19b43a26b5a43800d
2014-06-16 15:39:54 -07:00
Robert Ly
72d79e2d61 am e1b39896: am 908a05a1: fix hero image offset in css
* commit 'e1b39896fe55fc961f05dbd6aaa0666653de16c6':
  fix hero image offset in css
2014-06-16 20:05:02 +00:00
Robert Ly
e1b39896fe am 908a05a1: fix hero image offset in css
* commit '908a05a1ee87bdf6d4f27355d0a0d648ab8f8da0':
  fix hero image offset in css
2014-06-16 17:53:40 +00:00
Robert Ly
908a05a1ee fix hero image offset in css
Change-Id: I7633a852166ca8781f753f7f63829a3394f38773
2014-06-16 10:47:50 -07:00
Joe Fernandez
cbade38515 am fc0f5453: Android TV - small CSS fixes for TV landing page
* commit 'fc0f54534270ed005c8929769844b12c9de773c9':
  Android TV - small CSS fixes for TV landing page
2014-06-15 22:01:31 +00:00
Joe Fernandez
fc0f545342 Android TV - small CSS fixes for TV landing page
Change-Id: I672b5299e71d840ccc53561e540c33ede14cbcf7
2014-06-15 14:53:08 -07:00
Robert Ly
cbc14812af am e7eeb400: add support for microsites
* commit 'e7eeb4002938fdc52820fb8aa02896d536c82a9e':
  add support for microsites
2014-06-15 21:34:02 +00:00
Robert Ly
e7eeb40029 add support for microsites
Change-Id: If41551747df098f679bdf18fe3460b727fc094fb
2014-06-15 14:07:31 -07:00
Doug Zongker
8282282122 use fs_config and file_contexts from target_files
When building images, we want to use the file_contexts and fs_config
data contained in the target_files zip, rather than whatever happens
to be in the current client.

Change-Id: I13df2405898039f5a9b4bb4837147e76b31b068a
2014-06-16 09:24:41 -07:00
Joe Fernandez
43384728fb am cbade385: am fc0f5453: Android TV - small CSS fixes for TV landing page
* commit 'cbade38515245008d46af016e045e5a3e79c3b96':
  Android TV - small CSS fixes for TV landing page
2014-06-16 10:02:25 +00:00
Robert Ly
3b6026a94a am cbc14812: am e7eeb400: add support for microsites
* commit 'cbc14812af371d1dbf16fbbafe174563cfcd8a23':
  add support for microsites
2014-06-15 21:36:20 +00:00
smain@google.com
a1404e9796 am b3687721: am 9cb34eae: add margin for paras in sidebox
* commit 'b368772154ecb04504388798f0305001540e7acf':
  add margin for paras in sidebox
2014-06-14 01:17:38 +00:00
smain@google.com
b85e417d90 am cff12133: am 20ef3823: add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
* commit 'cff12133cdae4e35884cd16d6d62a243a8f2459e':
  add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
2014-06-14 01:17:32 +00:00
smain@google.com
b368772154 am 9cb34eae: add margin for paras in sidebox
* commit '9cb34eae761d18d54df115ab416862850ff070f2':
  add margin for paras in sidebox
2014-06-14 00:55:36 +00:00
smain@google.com
9cb34eae76 add margin for paras in sidebox
Change-Id: I15ec01da9dc1130552743aad3543b3ea14d2bbb4
2014-06-13 17:47:43 -07:00
smain@google.com
cff12133cd am 20ef3823: add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
* commit '20ef3823691b341d2a8d7c30af331371dbe8425f':
  add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
2014-06-14 00:39:38 +00:00
smain@google.com
20ef382369 add About pages to the quicknav and
tweak new h1 styles and move training navbar down
so the page title can span the page width before wrapping

Change-Id: I517c29d8ee3a2d7347ae50ca47005b51c174fa1c
2014-06-13 17:30:41 -07:00
smain@google.com
587e8e866c am 7ef59c0a: am b0580df3: Merge "template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274" into klp-modular-dev
* commit '7ef59c0ac7419b5795884d5fe7b70b31d77bb31b':
  template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274
2014-06-13 22:27:07 +00:00
smain@google.com
fc92fbc71e am 2e0551e5: am 77a6812d: Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
* commit '2e0551e58fcf26a82e7b52c1fbfe50dc3ef5fad6':
  add About secondary nav bar and delete the Wear custom header
2014-06-13 22:27:06 +00:00
smain@google.com
7ef59c0ac7 am b0580df3: Merge "template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274" into klp-modular-dev
* commit 'b0580df3088172caa82847605ec39822aa7c26b0':
  template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274
2014-06-13 22:15:10 +00:00
smain@google.com
2e0551e58f am 77a6812d: Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
* commit '77a6812dd844d586ded060e14bbbeccff7bd0338':
  add About secondary nav bar and delete the Wear custom header
2014-06-13 22:15:09 +00:00
smain@google.com
6040ffa1e8 add About secondary nav bar
and delete the Wear custom header

Change-Id: If7ac93556586d369a2dbf7e1fc4044473ace7bc9
2014-06-13 22:10:37 +00:00
Doug Zongker
1113e38195 test block patch more realistically
Read and write the same file when testing block patches, which can
turn up errors that don't show up otherwise.  (And will appear on the
device.)

Change-Id: Ic9b8d93ec980d13163b135f619af589f41433d7f
2014-06-13 10:38:32 -07:00
Dirk Dougherty
3740faf550 am 89654d31: am a6913b5c: Adjust heading sizes and weights.
* commit '89654d31a3ddf62da12b5c8de8734f69ea7e0376':
  Adjust heading sizes and weights.
2014-06-12 20:12:14 +00:00
Dirk Dougherty
89654d31a3 am a6913b5c: Adjust heading sizes and weights.
* commit 'a6913b5c22b8eac6b5b62099c3a848a1e712d675':
  Adjust heading sizes and weights.
2014-06-12 20:08:07 +00:00
Scott Main
8d87c44215 am b7de5e84: am c29b3f58: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
* commit 'b7de5e8474b18d9d9782cafb064b7412aa630ae5':
  changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
2014-06-12 19:23:50 +00:00
Dirk Dougherty
a6913b5c22 Adjust heading sizes and weights.
Change-Id: Ib8b764bcb6c7d610e05bd6e38f8ee01a34dd5ce9
2014-06-12 19:14:24 +00:00
Scott Main
b7de5e8474 am c29b3f58: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
* commit 'c29b3f58b0edc60ecaaedb652475fdad4ffe7bfd':
  changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
2014-06-12 19:04:36 +00:00
smain@google.com
b0580df308 Merge "template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274" into klp-modular-dev 2014-06-12 03:30:50 +00:00
smain@google.com
e39012b745 template changes for new sdk download pages; remove tools/ page.
companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274

Change-Id: I2dbc452e8ad3a2b58b86ea807ab557f19e6ada58
2014-06-13 11:43:13 -07:00
Scott Main
c29b3f58b0 changes to sdk template for new install workflow.
add auto-redirect to install page after download starts.

Change-Id: Ic084742376870ab17eefd639d50540f6222cddf6
2014-06-11 20:25:30 -07:00
Martin Blumenstingl
374e114d16 Document the worker_threads option.
Change-Id: I44775493bedc0c7224c2c4ef06330bdb1430a1b6
2014-06-11 23:03:44 +02:00
Doug Zongker
4b9596fe00 configure progress bar during block OTA script generation
Emit script commands to produce a more accurate progress bar (for full
block OTAs) and a working progress bar (for incremental block OTAs) --
ones that are driven by the progress callback from the thing actually
writing the system image.

Change-Id: Ifca10be68cfdaab7135d23515bd0ae5be2f98a16
2014-06-09 14:15:45 -07:00
Ying Wang
1cd740f1f0 am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds
* commit '1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
  Fix emulator builds
2014-06-04 22:30:05 +00:00
Ying Wang
1343ec169c am b75fe469: am eafdd2cd: Fix emulator builds
* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds
2014-06-04 22:24:51 +00:00
Ying Wang
b75fe4696e am eafdd2cd: Fix emulator builds
* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
  Fix emulator builds
2014-06-04 22:21:38 +00:00
Ying Wang
eafdd2cd87 Fix emulator builds
which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
2014-06-04 15:16:17 -07:00
Ying Wang
3a9cb0ca11 Merge "Allow to build the update.zip for emulator build." 2014-06-04 17:40:45 +00:00
Ying Wang
e8dc18680f am dc7ff054: am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
  Allow to build the update.zip for emulator build.
2014-06-04 17:30:32 +00:00
Ying Wang
dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
2014-06-04 17:26:00 +00:00
Ying Wang
bc080d510f am 2a386e0c: Allow to build the update.zip for emulator build.
* commit '2a386e0cfbdfa009038acede85876a7643f297f5':
  Allow to build the update.zip for emulator build.
2014-06-04 17:22:21 +00:00
Ying Wang
2a386e0cfb Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-04 17:04:14 +00:00
Dirk Dougherty
5507f4f270 am f092f7fd: am cfdf93c0: am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit 'f092f7fd2dc1a7b0cb602e69d78f492edacf541d':
  css adjustments for headings with dynamic content
2014-06-04 00:12:00 +00:00
Dirk Dougherty
41e8f7eba5 am 41848612: am e473e9bd: am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '4184861247d997858c0cc23aa5623698c649eeca':
  Add universal analytics code.
2014-06-04 00:11:54 +00:00
Dirk Dougherty
f092f7fd2d am cfdf93c0: am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit 'cfdf93c003a7afc18eb9a79921abf7b472e6d745':
  css adjustments for headings with dynamic content
2014-06-03 23:18:12 +00:00
Dirk Dougherty
cfdf93c003 am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '201cdd30e07ecddb333b4e347fbf14493fd2643c':
  css adjustments for headings with dynamic content
2014-06-03 23:14:41 +00:00
Dirk Dougherty
600e588e99 Merge "css adjustments for headings with dynamic content" into klp-docs 2014-06-03 23:08:13 +00:00
Dirk Dougherty
4184861247 am e473e9bd: am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit 'e473e9bdc95b7f962d30d577975411b106b0eafe':
  Add universal analytics code.
2014-06-03 23:03:22 +00:00
Dirk Dougherty
e473e9bdc9 am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '706bb0eb6455a7775596a87c9d515113e227c571':
  Add universal analytics code.
2014-06-03 23:01:49 +00:00
Dirk Dougherty
44b740e7e5 Merge "Add universal analytics code." into klp-docs 2014-06-03 22:56:51 +00:00
Michael Runge
4eb9e61c24 Merge "Add sprout support to signing tools" 2014-06-03 22:32:38 +00:00
Michael Runge
dc2661afe2 Add sprout support to signing tools
Bug: 15379701

Change-Id: Ied8329e1162250cc5509b65ef8bf0b5a9ddda3c3
2014-06-03 15:30:40 -07:00
Ying Wang
f8824aff68 Allow to build the update.zip for emulator build.
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-03 14:07:27 -07:00
Scott Main
6683556dfb am 5ffee03c: am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '5ffee03c8573ab404a7b466bf64a8254665d8efc':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:14:09 +00:00
Scott Main
5ffee03c85 am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '88c6d8d33e8b5532e3b6c940cc044454fcea206a':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:06:39 +00:00
Scott Main
88c6d8d33e am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '8c02b1ac514b5757aad7d2736ed97bcbff7c7d58':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:15:56 +00:00
Dirk Dougherty
44ed861279 Add universal analytics code.
Change-Id: I3b565a1cd422c5cbd3da8560e533741b880615a7
2014-06-02 19:07:37 -07:00
Scott Main
7a7abbdb10 Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs 2014-06-03 02:06:33 +00:00
Dirk Dougherty
2e3fb81b52 css adjustments for headings with dynamic content
Change-Id: I54e184b10677b21003bd282919423b525b8aa705
2014-06-01 21:28:20 -07:00
Dirk Dougherty
0da4cd8974 am 93d62e61: am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '93d62e613221f92a68846523616028fa922a0f43':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 17:02:00 +00:00
Dirk Dougherty
93d62e6132 am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e445387e560f7116087a327d43405f24c9e3ff08':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 16:57:01 +00:00
Dirk Dougherty
e445387e56 am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e2adcfefd32338cacd9837ba18e310f7c647e766':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:44:03 +00:00
Dirk Dougherty
518ed145b1 Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
2014-05-30 21:24:42 -07:00
Scott Main
06f3f2c148 fix bug in chrome with anchors not scrolling into view on new pages.
added a 100ms delay to the scroll offset because chrome does not
immediately scroll the page to the anchor on page load.

Change-Id: Ib10cfecfe63d9d9220170842f4c8941557c0eb06
2014-05-30 11:42:23 -07:00
Scott Main
9e4dbb5a16 am e39d7b63: am 04f811c8: am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit 'e39d7b63e40c8664827159d29842ac206a7e478f':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 23:04:25 +00:00
Scott Main
e39d7b63e4 am 04f811c8: am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '04f811c80e2d32e88f73b7d7866da1e9ed699786':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:59:57 +00:00
Scott Main
04f811c80e am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '573db58ef78a1cd80845204c6e5141a6205aa305':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:54:12 +00:00
Scott Main
ea98c84133 Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs 2014-05-29 22:33:55 +00:00
Scott Main
8c980422e3 am bcdbb68a: am ed02b7fb: am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit 'bcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 22:05:38 +00:00
Scott Main
bcdbb68a9b am ed02b7fb: am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit 'ed02b7fb1219de39adbec8ad432684822e37e320':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 21:57:59 +00:00
Scott Main
ed02b7fb12 am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '8b2be3d81d780e0549907b58ebf860e0cbbabd07':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 21:52:47 +00:00
Scott Main
554cd62ffa am 8758e0cd: am e2808370: am c0387cd0: am e7d75351: when generating training course pages, use localized descriptions when available
* commit '8758e0cdf0f9d41c420ef64c8362788707fd378c':
  when generating training course pages, use localized descriptions when available
2014-05-23 19:34:28 +00:00
Scott Main
8758e0cdf0 am e2808370: am c0387cd0: am e7d75351: when generating training course pages, use localized descriptions when available
* commit 'e280837053708f85520574c3ccb36be3e367a255':
  when generating training course pages, use localized descriptions when available
2014-05-23 00:42:39 +00:00
Scott Main
e280837053 am c0387cd0: am e7d75351: when generating training course pages, use localized descriptions when available
* commit 'c0387cd0f156b9e657e72ca2e24d402e5e0fe57c':
  when generating training course pages, use localized descriptions when available
2014-05-23 00:38:23 +00:00
Scott Main
f525781ea8 fix regression with horizontal scroll so the sidenav moves
with the rest of the content when the sticky bar is visible

Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
2014-05-22 17:30:43 -07:00
Scott Main
e7d75351a9 when generating training course pages, use localized descriptions when available
Change-Id: I1b5078e04b440bf5dff71dc31333bcf1d2202ff9
2014-05-22 16:23:48 -07:00
Scott Main
91b555710c update css for header offset alignment
and remove obsolete h1 styles for distribute docs.
cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0

Change-Id: I9dc175057b6e452cc2754a7da0ee73179c6e8299
2014-05-22 11:30:14 -07:00
Scott Main
501cf291d0 am 6433592a: am 0250f80e: am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
* commit '6433592aecbfd2aa40a9395866be23ae04c36f63':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 18:01:18 +00:00
Scott Main
6433592aec am 0250f80e: am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
* commit '0250f80ef0708e9ba71a77cffb29afb2356a5d25':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 15:01:51 +00:00
Scott Main
0250f80ef0 am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
* commit 'e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 14:58:15 +00:00
Scott Main
b16376f2e6 Change scroll position with javascript instead of CSS.
Makes scroll adjustment work for all types of anchors.
bug: 15129373

Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
2014-05-21 20:47:42 -07:00
Scott Main
7b93f1e506 am 29498430: am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit '29498430029f5a4925e37db4abbf8b6fde4d6f4d':
  add 2x version of logo for sticky bar
2014-05-20 18:16:17 +00:00
Scott Main
2949843002 am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
  add 2x version of logo for sticky bar
2014-05-20 17:21:55 +00:00
Scott Main
a8fcb35ec1 am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
  add 2x version of logo for sticky bar
2014-05-20 17:19:22 +00:00
Scott Main
c426499ee8 add 2x version of logo for sticky bar
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Dirk Dougherty
9b9b98376a am 7a62e01c: am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '7a62e01c0baa27d7cff53b4ac4d082710691e8c4':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:23:53 +00:00
Dirk Dougherty
7a62e01c0b am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '63168ffff85e8888c003588b4beeab6769d578ed':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:12:52 +00:00
Dirk Dougherty
63168ffff8 am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit 'b4cb3ebc37423db5dc5b5327999d7efe874d7148':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:08:50 +00:00
Geremy Condra
961e316223 Merge "Fix salt for verity tree generation." 2014-05-19 17:20:24 +00:00
Dirk Dougherty
ca1230c9a2 Minor fixes for handling cross-browser load issues and positioning of #headings.
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
2014-05-18 22:10:43 -07:00
Geremy Condra
e8e982afd3 Fix salt for verity tree generation.
Prior to this change salts were randomly generated, causing OTAs
to fail when they tried to check whether the system they were
installing on was binary identical to the source from which they
were generated.

Bug: 15018770
Change-Id: I86fffe2264a0c263aaf47112fb82fa71240e3403
2014-05-16 19:14:30 -07:00
Doug Zongker
0faa55a0bf am 994a8db5: am c7933482: am c0f10644: Merge "make SignApk do zip alignment"
* commit '994a8db5a990676f1b08dab2ee980a9fc8d63685':
  make SignApk do zip alignment
2014-05-16 17:40:54 +00:00
Doug Zongker
994a8db5a9 am c7933482: am c0f10644: Merge "make SignApk do zip alignment"
* commit 'c79334829885a82f600779d39b5577b921c64f67':
  make SignApk do zip alignment
2014-05-16 16:03:59 +00:00
Doug Zongker
c793348298 am c0f10644: Merge "make SignApk do zip alignment"
* commit 'c0f10644bf877fae44e8aa5ebfff41f0e27af197':
  make SignApk do zip alignment
2014-05-16 15:59:51 +00:00
Doug Zongker
1d67eec191 make SignApk do zip alignment
When signing an APK, make the SignApk tool align the stored entries to
(by default) 4-byte boundaries.  This obviates the need to run the
separate zipalign tool, which currently does this job.

The alignment byte count can be specified with the -a option.  OTA
package signing (with -w) never does alignment.

The order of files in the output APK is changed so that all stored
files come first in the output, followed by all non-stored files.
This is not expected to have any impact in practice.

Change-Id: Iaeef89b2a7283e25fadb99c0a0f0641f682d76b8
2014-05-15 09:54:26 -07:00
Ying Wang
8200231ae1 am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
  Support host multilib build
2014-05-15 01:09:49 +00:00
Ying Wang
e50f2d9f32 am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit '40b49d3043bd41ca5548b99b537038187fdca258':
  Support host multilib build
2014-05-15 00:44:53 +00:00
Ying Wang
40b49d3043 am a74ade94: Merge "Support host multilib build"
* commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6':
  Support host multilib build
2014-05-15 00:41:37 +00:00
Ying Wang
6feb6d5607 Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Dirk Dougherty
5772ce6130 Sync master templates with upstream branch, retain annotation customization from master.
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
2014-05-14 15:04:40 -07:00
Dirk Dougherty
efb9987de6 am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:09:39 +00:00
Dirk Dougherty
8fdd4a0b56 am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '7db3e8a518ee51ba1a511948de71675e3457ff13':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:02:39 +00:00
Dirk Dougherty
7db3e8a518 am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
Dirk Dougherty
c3921656f5 Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Geremy Condra
15d5348e6c Reopen temporary system image to avoid stale data.
NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.

This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.

Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4
2014-05-13 20:23:54 -07:00
Geremy Condra
c10320eef3 Merge "Add verity support to make dist." 2014-05-12 17:00:58 +00:00
Geremy Condra
5b5f4958d8 Add verity support to make dist.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
Scott Main
bd58064a62 am 17b3567b: am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav
* commit '17b3567b064fa8d8637113c49014494e25241aa6':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:23:05 +00:00
Scott Main
17b3567b06 am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the he
* commit 'e4af3b35588932d9f14eacaee783bb6fcff0d72b':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:18:17 +00:00
Scott Main
e4af3b3558 am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is
* commit '18ba007b371478254faa43f563ee28295e7d742d':
  update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:13:27 +00:00
Michael Runge
4f12fceead Add missing quotation mark in assertion
Change-Id: I3e76997fe257bfccb7d61dcc1273e014cdb55a41
2014-05-09 14:14:42 -07:00
Doug Zongker
91a99c28e0 fix ota script to generate non-block commands correctly
If you had a target_files without a recovery patch and specified
--block (which should have no effect without a patch), it would have
omitted some necessary commands from the OTA script.

Change-Id: I96e79cd561ebf09cfe53792d1cc558cc71479869
2014-05-09 13:16:50 -07:00
Scott Main
7a6ab434bc update wear header template to support sticky nav.
moved the search and menu markup for the header into a method call.
also update the styles and script so that when a page does not belong
to a primary horizontal-nav link, the header logo is used for the breadcrumb's
first link and text.

Change-Id: I14129fe7657924e2037c103674e09322c4c31db8
2014-05-09 12:16:14 -07:00
Doug Zongker
af845256f1 assert recovery finger/thumbprints, not system
Block OTAs don't have the system partition mounted and so can't use
file_getprop on the system partition.  Make assertions look at the
recovery system finger/thumbprints, which should be the same as the
ones on the system partition (even for sprout devices).

Change-Id: Ie5d329d13beab4b428e37f75da9b9e1b8ceb35bc
2014-05-09 08:29:05 -07:00
Ed Heyl
3e92fd0fba Fix build: Revert "Add verity support to make dist."
This reverts commit 5dee206d8e.

Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
2014-05-09 05:53:54 +00:00
Geremy Condra
5dee206d8e Add verity support to make dist.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
Michael Runge
0a2ce08f66 Merge "Support block OTA + OEM partition" 2014-05-05 19:57:56 +00:00
Michael Runge
c6e3afd26d Support block OTA + OEM partition
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
2014-05-05 12:22:12 -07:00
Colin Cross
e8eef02cca Merge "verity: switch to C++ version of build_verity_tree" 2014-05-02 23:52:16 +00:00
Dirk Dougherty
03257fe50c am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 23:03:45 +00:00
Dirk Dougherty
d19aa4bae2 am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:58:02 +00:00
Dirk Dougherty
611d7e14e8 am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '379d9968ccc31701053eca7e0d809f2f52c0b964':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:54:45 +00:00
Dirk Dougherty
e21bed28ac Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
2014-05-02 15:44:20 -07:00