tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21849 commits 1 branch 0 tags 119 MiB
Commit graph

2786 commits

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

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

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

Bug: 18430740
Change-Id: I9210355b6bfec74d002d1f40b930330740f379a5
 2014-11-21 00:46:03 -08:00
Dirk Dougherty
8c657dc214 am b87e3000: Support langs. 
* commit 'b87e300056f2141c80f0cf895af0c1bc708a3542':
  Support langs.
 2014-11-20 00:03:25 +00:00
Dirk Dougherty
b87e300056 Support langs. 
Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
 2014-11-19 23:31:03 +00:00
Ying Wang
e91b83d5e6 Support journal size board config variables. 
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740

(cherry picked from commit f3b86357e2)

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

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

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

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

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

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

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

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

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

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

Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
 2014-11-03 11:39:00 -08:00
Dirk Dougherty
7b562067a8 am 7d25b7d3: am b6dfc2d2: am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled. 
* commit '7d25b7d346a6b855f708d90236aeee59ba6ddbe2':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
 2014-11-03 18:03:48 +00:00
Dirk Dougherty
b6dfc2d2f7 am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled. 
* commit '963afcbb501d8757f049b25f5068313ee63ce4e8':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
 2014-11-03 17:53:28 +00:00
Dan Albert
4043168802 am 17c0e737: am ce915d95: Merge "Never use ASAN for acp." 
* commit '17c0e737047dcfa74cbd2386660b67bcde284f4c':
  Never use ASAN for acp.
 2014-11-03 17:45:22 +00:00
Dirk Dougherty
963afcbb50 am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled. 
* commit '9b7f8f20ac58133af551bc89e5f065a4e0f77103':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
 2014-11-03 17:43:20 +00:00
Dan Albert
17c0e73704 am ce915d95: Merge "Never use ASAN for acp." 
* commit 'ce915d950aaea86e566c8aec06be181a65c17cf2':
  Never use ASAN for acp.
 2014-11-03 17:40:31 +00:00
Dirk Dougherty
9b7f8f20ac Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled. 
Change-Id: Ib7968010b0d0707a82ec51b1e63611628b8d465a
 2014-11-01 20:33:25 -07:00
Dan Albert
7909ea9922 Never use ASAN for acp. 
Since acp is needed to build the ASAN libs, we can't use ASAN to
instrument it. Since libhost is included statically in acp, we can't
instrument that either.

Change-Id: Idb389df945380b6ef447fc3d3ead8be27ec09011
 2014-10-31 16:33:08 -07:00
Michael Runge
aa898700b0 am 63f01de8: Add post-install verification phase 
automerge: c9594af

* commit 'c9594afa930e5400d35bbf24a17cb9be8d978888':
  Add post-install verification phase
 2014-10-30 19:01:43 +00:00
Michael Runge
c9594afa93 am 63f01de8: Add post-install verification phase 
* commit '63f01de81892aa4e40b517464b3d9ca7db666c9d':
  Add post-install verification phase
 2014-10-29 18:51:51 +00:00
Michael Runge
63f01de818 Add post-install verification phase 
Verify the SHA sum of all patched and extracted files after
a file system remount.

Bug: 18145574

Change-Id: I2f053d085543e10e39153a774542d37ee0a238bd
 2014-10-29 02:54:51 +00:00
Michael Runge
3bd5469025 am 46fe30ef: am fb8886db: get_stage in updater takes one param, not two. 
* commit '46fe30eff7c66ce5ec8fd8d6b3aba91b55a5e12f':
  get_stage in updater takes one param, not two.
 2014-10-23 22:20:09 +00:00
Michael Runge
1df3823808 am 10ba5654: am 7cd99bad: Allow info_dict from target_files to specify mount options 
* commit '10ba56543175590bdee9e6ab13c63c3ca8beb26b':
  Allow info_dict from target_files to specify mount options
 2014-10-23 22:20:07 +00:00
Michael Runge
46fe30eff7 am fb8886db: get_stage in updater takes one param, not two. 
* commit 'fb8886db6858388af5082268fd023b8a44fb87ea':
  get_stage in updater takes one param, not two.
 2014-10-23 21:57:12 +00:00
Michael Runge
10ba565431 am 7cd99bad: Allow info_dict from target_files to specify mount options 
* commit '7cd99bad210455dc57702b7cbf674a588a5eb028':
  Allow info_dict from target_files to specify mount options
 2014-10-23 21:57:10 +00:00
Michael Runge
fb8886db68 get_stage in updater takes one param, not two. 
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
 2014-10-23 13:51:04 -07:00
smain@google.com
7a258a9141 am 60e80ef6: am f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev 
* commit '60e80ef6e7f6a05a654154d0f43bf31ebe8fdae3':
  add helpouts script to <head>, behind a condition that can be enabled per page
 2014-10-23 20:28:20 +00:00
smain@google.com
60e80ef6e7 am f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev 
* commit 'f84e045e42f0377c415b2b6fea432ea0f3967f4f':
  add helpouts script to <head>, behind a condition that can be enabled per page
 2014-10-23 16:34:39 +00:00
Michael Runge
7cd99bad21 Allow info_dict from target_files to specify mount options 
This will allow safer mount options to be added per mount FS
type, to better ensure data is written during an OTA.
Bug: 18079773, 18092222

Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b
 2014-10-22 18:38:49 -07:00
smain@google.com
8df21b19c4 add helpouts script to <head>, behind a condition that can be enabled per page 
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
 2014-10-22 09:55:04 -07:00
Clay Murphy
238964e1e2 am f7b231b7: Docs: Making source.android.com headers match those of developer.android.com 
* commit 'f7b231b7a64c2ab953c9f4a2eb5390f0b3a2f296':
  Docs: Making source.android.com headers match those of developer.android.com
 2014-10-22 14:53:29 +00:00
Clay Murphy
f7b231b7a6 Docs: Making source.android.com headers match those of developer.android.com 
Bug: 17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
 2014-10-21 10:25:35 -07:00
Clay Murphy
064b489f85 am 597bfe1e: am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev 
* commit '597bfe1e0b154df60a8ad9322ff6f248c617a9c1':
  Docs: Fixing link, adding Android Partner logo.
 2014-10-17 20:29:02 +00:00
Clay Murphy
597bfe1e0b am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev 
* commit '327180f5d2009be990076f152dffb244939b1673':
  Docs: Fixing link, adding Android Partner logo.
 2014-10-17 20:01:06 +00:00
Clay Murphy
11fac77937 am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev 
* commit '327180f5d2009be990076f152dffb244939b1673':
  Docs: Fixing link, adding Android Partner logo.
 2014-10-17 19:52:28 +00:00
Clay Murphy
327180f5d2 Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev 2014-10-17 19:47:51 +00:00
smain@google.com
05bba0f362 am bd78b888: am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs 
* commit 'bd78b888a5072cc784a52f1b45fce765205a33e7':
  fix broken download buttons, make a[name] offset apply only to reference docs
 2014-10-17 19:12:11 +00:00
smain@google.com
ea313f1a81 am fc3f1719: am 947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev 
* commit 'fc3f1719b48c80749e9b48c914acee3e3be2a618':
  fix z-order of hangouts to avoid clobbering the search suggest
 2014-10-17 19:12:10 +00:00
Joe Fernandez
0769da021e am d804dac5: am e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev 
* commit 'd804dac5d87a4cb5ebcbfcb650f3c7b6a821441e':
  Doc change: update query params to force refresh of local js files.
 2014-10-17 19:12:09 +00:00
smain@google.com
9130a81210 am 7f37fba6: am 19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev 
* commit '7f37fba64573c6b6d755e1a3c36422555feb6ff2':
  fix scroll offset when loading non-header pages
 2014-10-17 19:12:08 +00:00
David Friedman
e5f5d5a14f am a3427287: am e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/ 
* commit 'a342728747de31a19f30fe30b46e5452cebfb359':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
 2014-10-17 19:12:07 +00:00
smain@google.com
bd78b888a5 am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs 
* commit 'be113f8ac0f5ae00fa997db5f4507af55c523367':
  fix broken download buttons, make a[name] offset apply only to reference docs
 2014-10-17 18:53:32 +00:00
smain@google.com
fc3f1719b4 am 947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev 
* commit '947f3e9ecf9bc7875d210a45053826eb0e110186':
  fix z-order of hangouts to avoid clobbering the search suggest
 2014-10-17 18:52:43 +00:00
Joe Fernandez
d804dac5d8 am e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev 
* commit 'e321df0ca2eaada3e126393a7976cd4cc09afdf6':
  Doc change: update query params to force refresh of local js files.
 2014-10-17 18:50:48 +00:00
smain@google.com
7f37fba645 am 19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev 
* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
  fix scroll offset when loading non-header pages
 2014-10-17 18:50:47 +00:00
David Friedman
a342728747 am e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/ 
* commit 'e0471a82276d86c671a9e2a21f58eb140cb94dc0':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
 2014-10-17 18:50:46 +00:00
smain@google.com
eaad664b44 am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs 
* commit 'be113f8ac0f5ae00fa997db5f4507af55c523367':
  fix broken download buttons, make a[name] offset apply only to reference docs
 2014-10-17 17:00:47 +00:00
smain@google.com
be113f8ac0 fix broken download buttons, make a[name] offset apply only to reference docs 
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
 2014-10-17 09:56:10 -07:00
smain@google.com
e070d7820d Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev 
automerge: 947f3e9

* commit '947f3e9ecf9bc7875d210a45053826eb0e110186':
  fix z-order of hangouts to avoid clobbering the search suggest
 2014-10-17 08:33:52 +00:00
smain@google.com
947f3e9ecf Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev 2014-10-17 08:27:18 +00:00
smain@google.com
77cf43e739 fix z-order of hangouts to avoid clobbering the search suggest 
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
 2014-10-17 01:21:13 -07:00
Joe Fernandez
6b607ce33d Merge "Doc change: update query params to force refresh of local js files." into lmp-dev 
automerge: e321df0

* commit 'e321df0ca2eaada3e126393a7976cd4cc09afdf6':
  Doc change: update query params to force refresh of local js files.
 2014-10-17 05:50:19 +00:00
Joe Fernandez
e321df0ca2 Merge "Doc change: update query params to force refresh of local js files." into lmp-dev 2014-10-17 05:41:07 +00:00
smain@google.com
c5b105a3a8 Merge "fix scroll offset when loading non-header pages" into lmp-dev 
automerge: 19c6780

* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
  fix scroll offset when loading non-header pages
 2014-10-17 05:34:36 +00:00
smain@google.com
19c6780f9f Merge "fix scroll offset when loading non-header pages" into lmp-dev 2014-10-17 05:18:08 +00:00
smain@google.com
11fc009469 fix scroll offset when loading non-header pages 
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
 2014-10-16 22:10:00 -07:00
David Friedman
79df76b1d5 Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/ 
automerge: e0471a8

* commit 'e0471a82276d86c671a9e2a21f58eb140cb94dc0':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
 2014-10-17 05:03:02 +00:00
Clay Murphy
06dbd2655c Docs: Fixing link, adding Android Partner logo. 
Bug: 17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d
 2014-10-16 18:23:58 -07:00
David Friedman
e0471a8227 Changes to NDK download table format to reflect change in download structure 
Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/

Change-Id: Id19f095c506bab62a3be23a1cb0d1bf30369c54d
 2014-10-16 12:14:04 -07:00
smain@google.com
624a948b85 am 8e8b871c: am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev 
* commit '8e8b871cd6e0fae18e50c11329cb58360c2e165e':
  add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
 2014-10-16 18:50:14 +00:00
smain@google.com
8e8b871cd6 am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev 
* commit 'f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
  add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
 2014-10-16 18:35:37 +00:00
Dirk Dougherty
88c15600b8 Doc change: update query params to force refresh of local js files. 
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
 2014-10-16 10:28:52 -07:00
smain@google.com
07aade6f47 am f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev 
* commit 'f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
  add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
 2014-10-16 16:36:40 +00:00
smain@google.com
f0d8234ba9 Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session" into lmp-dev 2014-10-16 16:32:38 +00:00
Doug Zongker
0a364e8973 am 641bfedd: am e18eb508: add support for the \'fill\' chunk type to sparse_img 
* commit '641bfeddf32e902842bcbcfa76d9a9c68b822659':
  add support for the 'fill' chunk type to sparse_img
 2014-10-16 07:00:26 +00:00
Michael Runge
1eb7a595ab am 92946baa: am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev 
* commit '92946baa035ee9376478185fbd74849730d20768':
  Fix public/private key options on sign_target_files_apks
 2014-10-16 07:00:25 +00:00
smain@google.com
bfcef089ac am 5bf3bb5a: am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes 
* commit '5bf3bb5ab8be76972bce3f679631869e67185295':
  hide the butter bar but also update the CSS for recent butterbar changes
 2014-10-16 07:00:24 +00:00
Doug Zongker
641bfeddf3 am e18eb508: add support for the \'fill\' chunk type to sparse_img 
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
  add support for the 'fill' chunk type to sparse_img
 2014-10-16 05:52:53 +00:00
Michael Runge
92946baa03 am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev 
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
  Fix public/private key options on sign_target_files_apks
 2014-10-16 05:52:17 +00:00
Conley Owens
21f527bed8 am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev 
* commit 'c70ae578118573ec2073012ab57f0307184f74a3':
  Docs: Replacing s.a.c. Android logo to match other sites.
 2014-10-16 05:52:17 +00:00
smain@google.com
5bf3bb5ab8 am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes 
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
  hide the butter bar but also update the CSS for recent butterbar changes
 2014-10-16 05:52:16 +00:00
Doug Zongker
b883acc21c am e18eb508: add support for the \'fill\' chunk type to sparse_img 
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
  add support for the 'fill' chunk type to sparse_img
 2014-10-15 23:59:03 +00:00
Michael Runge
a64ce997e2 am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev 
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
  Fix public/private key options on sign_target_files_apks
 2014-10-15 23:57:24 +00:00
smain@google.com
3852f80d39 am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes 
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
  hide the butter bar but also update the CSS for recent butterbar changes
 2014-10-15 23:57:18 +00:00
smain@google.com
afb1fccfbb am e87bd05e: am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 
* commit 'e87bd05ecf8633c99f859a898f9a46a2a5c26e4b':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
 2014-10-15 23:57:09 +00:00
Doug Zongker
e18eb50850 add support for the 'fill' chunk type to sparse_img 
Bug: 17987996
Change-Id: Ia661e87877e52274a991ceb77bbed93b7e6218f2
(cherry picked from commit 629c7cc84d)
 2014-10-15 23:38:34 +00:00
smain@google.com
e87bd05ecf am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 
* commit '820e226d5dc63589dec0263d3639526addb5dbaa':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
 2014-10-15 23:24:55 +00:00
Conley Owens
c70ae57811 Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev 2014-10-15 21:27:14 +00:00
Clay Murphy
412a13217b Docs: Replacing s.a.c. Android logo to match other sites. 
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
 2014-10-15 14:09:09 -07:00
smain@google.com
fbdb2a1b62 add helpouts banner thing to recruit providers 
includes script to randomly change the URL and text of link as an A/B test
it's a bad A/B test because it does not save the A/B per session

Change-Id: Ie8338a7403834d2322c5088039f2936207db734b
 2014-10-15 13:05:21 -07:00
Michael Runge
9d641c41db Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev 2014-10-15 19:54:22 +00:00
smain@google.com
c69af6faeb hide the butter bar but also update the CSS for recent butterbar changes 
Change-Id: I29cbdfe4ef6542a0dd04642be76856f3af2732d1
 2014-10-15 12:48:58 -07:00
smain@google.com
093283a070 am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 
* commit '820e226d5dc63589dec0263d3639526addb5dbaa':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
 2014-10-15 19:17:43 +00:00
smain@google.com
820e226d5d am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 
* commit 'd1ab4cb3b4ca8de66a873abb072bd73556926d4d':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
 2014-10-15 19:11:38 +00:00
Michael Runge
947894f87e Fix public/private key options on sign_target_files_apks 
The if statements appear to check for public_signing
and then calls the private_signing function, and vice
versa.

Change-Id: I4511b9bcf0e03b9ba49b69eb80db84cf31d77020
 2014-10-14 20:58:38 -07:00
smain@google.com
d1ab4cb3b4 am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 
* commit '05e55e9009435072ac25d2ce487d47b6c4f8a60b':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
 2014-10-15 02:15:31 +00:00
smain@google.com
05e55e9009 Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs 2014-10-15 02:08:51 +00:00
smain@google.com
ee5b3b10de add butterbar for L announcement. 
make the butterbar an encapsulated method for inclusion multiple places.

Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
 2014-10-14 18:47:36 -07:00
smain@google.com
ddb60cbbc3 am a8752f9d: am f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev 
* commit 'a8752f9defb075c079a73d21bc9e99da26c5a3c9':
  fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
 2014-10-10 17:16:09 +00:00
smain@google.com
fbb9958f11 am e425f9bf: am 17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck. 
* commit 'e425f9bfddb7a395e6659c1ca1e312583fb314a6':
  make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
 2014-10-10 17:16:08 +00:00
smain@google.com
a8752f9def am f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev 
* commit 'f0daf562f766d1cf15583e171b94107c193e5db4':
  fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
 2014-10-10 15:17:17 +00:00
smain@google.com
e425f9bfdd am 17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck. 
* commit '17e2c06e8aa92b9d99e8e3a8e6f44a630e9529ad':
  make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
 2014-10-10 15:17:17 +00:00
smain@google.com
150a572351 am f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev 
* commit 'f0daf562f766d1cf15583e171b94107c193e5db4':
  fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
 2014-10-10 14:35:10 +00:00
smain@google.com
6cd8239682 am 17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck. 
* commit '17e2c06e8aa92b9d99e8e3a8e6f44a630e9529ad':
  make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
 2014-10-10 14:35:09 +00:00
smain@google.com
f0daf562f7 Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page" into lmp-dev 2014-10-10 02:12:24 +00:00
smain@google.com
17e2c06e8a make the <a> tag offset effective for the whole site, 
not just reference, because turns out these are also used in the manifest docs,
so what the heck.

Change-Id: I33d3cf842377511d0733983deffa03639eb0bdbf
 2014-10-09 19:10:32 -07:00
smain@google.com
2f077190ab fix bug causing anchors to fail on preview landing page; 
exit the onhashchange listener if there's no searchbar on the page

Change-Id: I7bdd31d0ea997e408b997856450822d1bc56af92
 2014-10-09 18:04:10 -07:00
Narayan Kamath
75635a1689 am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev 
* commit 'aec004e66c5b6bdb11e92a4acd329653128fa216':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
 2014-10-09 22:23:42 +00:00
Clay Murphy
9dd0da24aa am 96a81b18: am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com" 
* commit '96a81b18ac1f01760a3ef573289cefdfbc810cb7':
  Docs: Making source.android.com headers match those of developer.android.com
 2014-10-09 17:42:57 +00:00
Clay Murphy
37df3be46d am 96a81b18: am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com" 
* commit '96a81b18ac1f01760a3ef573289cefdfbc810cb7':
  Docs: Making source.android.com headers match those of developer.android.com
 2014-10-09 17:42:47 +00:00
Narayan Kamath
aec004e66c resolved conflicts for merge of 1a856098 to lmp-mr1-dev 
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
 2014-10-09 13:58:05 +01:00
Ying Wang
cc9e30ef35 am 1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev 
* commit '1a856098ea819a75ad904ff6d6dcfac9545a02a6':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
 2014-10-08 16:38:40 +00:00
Ying Wang
1a856098ea Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev 2014-10-08 16:33:16 +00:00
smain@google.com
bc35f351b8 am 0cf51ba9: am 783d016a: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working 
* commit '0cf51ba982b8d44269d2c1505d34e22a11aa265a':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
 2014-10-08 07:48:52 +00:00
smain@google.com
9f4c4fdb65 am 6ee8f9b2: am 4247c940: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 
* commit '6ee8f9b22bfda14397a317ff39029a1c42956838':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
 2014-10-08 07:48:52 +00:00
smain@google.com
0cf51ba982 am 783d016a: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working 
* commit '783d016a27ea342ad6445720026a14e89ae1c78c':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
 2014-10-08 05:19:11 +00:00
smain@google.com
6ee8f9b22b am 4247c940: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 
* commit '4247c940d45318f5553138fd37f13f85f2854c6a':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
 2014-10-08 05:19:10 +00:00
Ying Wang
e24e17a976 Export build thumbprint only if the product has specified at least one oem fingerprint property 
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
 2014-10-07 18:59:47 -07:00
smain@google.com
8fa6f74a29 am 783d016a: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working 
* commit '783d016a27ea342ad6445720026a14e89ae1c78c':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
 2014-10-07 22:32:12 +00:00
smain@google.com
51c6bc55c9 am 4247c940: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 
* commit '4247c940d45318f5553138fd37f13f85f2854c6a':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
 2014-10-07 22:32:11 +00:00
smain@google.com
783d016a27 am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working 
* commit 'bc667f1cd7d852909a9a3893473f29dc7b000b2f':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
 2014-10-07 22:23:35 +00:00
smain@google.com
4247c940d4 am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 
* commit 'f4cefc19e87eae62b6f2f8cc40b154f9fbe4b3de':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
 2014-10-07 22:23:19 +00:00
smain@google.com
bc667f1cd7 am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working 
* commit '08f336eaffa09581f2c33aee99847ee4edbeb370':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
 2014-10-04 00:46:20 +00:00
smain@google.com
08f336eaff fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c 
that causes anchors in most docs other than reference to stop working

Change-Id: I58ed0f7a84c4478d482d63e675693a197088019a
 2014-10-03 17:40:00 -07:00
smain@google.com
f4cefc19e8 am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 
* commit '633f322b38c9a16aa0cac78a1f2a3fb6b1cacf86':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
 2014-10-03 23:57:14 +00:00
smain@google.com
633f322b38 update the analytics tracking event calls to use new API for analytics.js 
bug: 16331906

Change-Id: I015b5aae825525822ca767d293b473f9f332961a
 2014-10-03 15:49:45 -07:00
Clay Murphy
fbdac37416 Docs: Making source.android.com headers match those of developer.android.com 
Bug: 17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
 2014-10-03 14:58:50 -07:00
smain@google.com
0ecfde0dfd am 0aa165d8: am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, wh 
* commit '0aa165d84adabd4555ceb3511cd3a4ab589983dc':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 21:42:45 +00:00
smain@google.com
0aa165d84a am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> 
* commit 'c464dbc3b673010720e66d6a299dadb1dfaadab6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 21:32:19 +00:00
smain@google.com
497e716dd7 am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> 
* commit 'c464dbc3b673010720e66d6a299dadb1dfaadab6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 19:21:41 +00:00
smain@google.com
c464dbc3b6 am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as ancho 
* commit '5e5f5b777414204cf600727662ac0f89de6f8211':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 19:03:43 +00:00
smain@google.com
5e5f5b7774 am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all AP 
* commit '7ddf794392d6e79fed66039fd9a59d37d12dbcd3':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 18:59:17 +00:00
smain@google.com
7ddf794392 am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bu 
* commit '9a818f55f4a4ca4f88c2a29f8e77ea6cb2153de6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
 2014-10-03 18:54:36 +00:00
smain@google.com
9a818f55f4 more fixes to scroll offset for the sticky header. 
This offsets the layout position of all <a name=""> tags so they naturally
show up below the sticky nav bar... though this is only for API reference,
which uses <a> tags as anchors for all API members.
bug: 16924057

Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
 2014-10-03 18:34:20 +00:00
Dirk Dougherty
174fa60766 am f30eef8f: am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit 'f30eef8f554a3241298a686c5e59e618dbc8e177':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 06:17:31 +00:00
Dirk Dougherty
f30eef8f55 am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit 'fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 06:04:51 +00:00
Dirk Dougherty
c55180c8a8 am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit 'fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 05:30:28 +00:00
Dirk Dougherty
fa5fb51030 am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit '6f1efb310be5f66f05a0ac40f4af92d4770a7598':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 05:25:08 +00:00
Dirk Dougherty
6f1efb310b am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit '11451e2ec160b0405528b2ba6c13b40b15df8ed1':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 05:20:41 +00:00
Dirk Dougherty
11451e2ec1 am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies. 
* commit '83fadade5bbc43914059405c1e49dd112e66d28d':
  Doc change: increment queryparam to trigger cache flush on proxies.
 2014-09-27 05:14:16 +00:00
Dirk Dougherty
83fadade5b Doc change: increment queryparam to trigger cache flush on proxies. 
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
 2014-09-26 15:00:55 -07:00
Doug Zongker
14c065bbb2 am e985f6f4: fix transfer list for full OTAs 
* commit 'e985f6f4d84e12ac3e189156f1260e008ef990d0':
  fix transfer list for full OTAs
 2014-09-26 14:54:00 +00:00
Doug Zongker
ead20e6a9a am 846cb3a9: add unit tests for rangelib 
* commit '846cb3a9e628cb00088bf65a153c0fedc10f2621':
  add unit tests for rangelib
 2014-09-26 14:53:59 +00:00
Doug Zongker
95dfa81664 am 62338188: generate version 2 blockimgdiff files 
* commit '623381880a32a2912f95949a6c406038ac4e7064':
  generate version 2 blockimgdiff files
 2014-09-26 14:53:58 +00:00
Jeff Arneson
46b670c788 am 151c7277: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev 
* commit '151c727736bfea2336383ee82414702fdd80a0b6':
  Refactor show_annotations_list to remove HTML tags from method params
 2014-09-26 00:22:32 +00:00
Doug Zongker
e985f6f4d8 fix transfer list for full OTAs 
The erase command we insert at the top for full OTAs was getting
inserted in the wrong place for version 2.

Change-Id: I9caf03a40efbdba79f3428f73e50d4319d9ba371
 2014-09-25 16:39:45 -07:00
Doug Zongker
846cb3a9e6 add unit tests for rangelib 
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
 2014-09-25 16:39:32 -07:00
Doug Zongker
623381880a generate version 2 blockimgdiff files 
Generate version 2 of the block_image_update transfer list format.
This improves patch size by a different strategy for dealing with
out-of-order transfers.  If transfer A must be done before transfer B
due to B overwriting A's source but we want to do B before A, we
resolve the conflict by:

  - before B is executed, we save ("stash") the overlapping region (ie
    the blocks B will overwrite that A wants to read)

  - when A is executed, it will read those parts of source data from
    the stash rather than from the image.

This reverses the ordering constraint; with these additions now B
*must* go before A.  The implementation of the stash is left up to the
code that executes the transfer list to apply the patch; it could hold
stashed data in RAM or on a scratch disk such as /cache, if available.

The code retains the ability to build a version 1 block image patch;
it's needed for processing older target-files.

Change-Id: Ia9aa0bd45d5dc3ef7c5835e483b1b2ead10135fe
 2014-09-25 16:39:14 -07:00
Jeff Arneson
5925fd13e8 am 151c7277: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev 
* commit '151c727736bfea2336383ee82414702fdd80a0b6':
  Refactor show_annotations_list to remove HTML tags from method params
 2014-09-25 03:56:53 +00:00
Jeff Arneson
151c727736 Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev 2014-09-25 03:45:50 +00:00
Michael Runge
a660afc33d am 7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev 
* commit '7914651f70a1a23c5f822a035c09054dc4ad3d38':
  If oem_fingerprint_props is empty, ignore.
 2014-09-19 09:31:11 +00:00
Michael Runge
5d40afe7f2 am 7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev 
* commit '7914651f70a1a23c5f822a035c09054dc4ad3d38':
  If oem_fingerprint_props is empty, ignore.
 2014-09-19 04:41:22 +00:00
Dan Albert
220b01ba27 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system." 
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
 2014-09-19 00:16:16 +00:00
Dan Albert
46edd9b103 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system." 
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
 2014-09-19 00:15:23 +00:00
Dan Albert
98f7742a7f Merge "Move selection of C++ STL into the build system." 2014-09-18 23:51:53 +00:00
Dan Albert
b05f2ca150 Move selection of C++ STL into the build system. 
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).

The selection of the STL is as follows:

    if LOCAL_CXX_STL == 'default'
      ifdef LOCAL_SDK_VERSION
        Use whatever STL the other NDK options have selected.
      else
        Use bionic's libstdc++ for target, GNU libstdc++ for host. This
        is compatible with the existing build options.
      endif
    else
      if LOCAL_CXX_STL == 'stlport'
        Use stlport.
      else if LOCAL_CXX_STL == 'libc++'
        Use libc++.
      else if LOCAL_CXX_STL == ''
        Don't use any STL.
      endif
    endif

Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
 2014-09-18 16:38:20 -07:00
Michael Runge
560569a617 If oem_fingerprint_props is empty, ignore. 
There may be cases where there is an OEM partition
but it has no effect on the OTA itself.  In these
cases, ignore an empty value from the misc_info.txt

Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
 2014-09-18 15:12:45 -07:00
Qiwen Zhao
d542afcb93 Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp 
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
 2014-09-18 12:21:48 -07:00
Qiwen Zhao
5726fec530 Merge commit 'e866294e' into lmp-dev-plus-aosp 
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
 2014-09-18 12:19:51 -07:00
Clay Murphy
d9e4b52a38 Docs: Replacing s.a.c. Android logo to match other sites. 
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
 2014-09-18 16:44:21 +00:00
Jeff Arneson
ad46e7e7a1 Refactor show_annotations_list to remove HTML tags from method params 
No need to pass in the HTML tags to start and end the list, since
we do the same thing everywhere, and it wasn't very complete anyways.

Change-Id: I504b78b699a03cc5ba7c6f0584173087aab2024b
 2014-09-15 10:02:14 -07:00
Jeff Arneson
3b62f196e1 am faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 
* commit 'faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
  Show annotation information for fields, enums, etc. and in the class list
 2014-09-12 19:20:17 +00:00
Jeff Arneson
faa1dc5c01 Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 2014-09-12 18:24:59 +00:00
Doug Zongker
f0c58d8135 am b34fcce0: explicitly check the superblock for differences 
* commit 'b34fcce08cc9ab358481e672d83ff16513c4ac37':
  explicitly check the superblock for differences
 2014-09-11 18:30:54 +00:00
Jeff Arneson
9eefef66a8 Show annotation information for fields, enums, etc. and in the class list 
Add the "Included in documentation due to annotations..." text for
fields, enum constants, and pretty much everything with a description.

Added annotation text to eh classes.cs file used to generate the
class list page.

Change-Id: I2685d1a34fa292088c03ccd76f2627fe954c9000
 2014-09-11 11:04:58 -07:00
Doug Zongker
b34fcce08c explicitly check the superblock for differences 
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect.  If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.

Bug: 17393999
Change-Id: Ifd2132b428dbc4907527291712690204a3664ac0
 2014-09-11 09:38:01 -07:00
Jeff Arneson
9910016592 am 0052f75f: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev 
* commit '0052f75f88abbe4d16ff3b921be78b848fd4f6f9':
  Make the text generated by showAnnotations more noticable in docs
 2014-09-11 00:23:00 +00:00
Jeff Arneson
1e7fd557dd Make the text generated by showAnnotations more noticable in docs 
Made the foreground of the "included in docs by annotation..." orange,
the same color used in the header of the docs page. This text is inserted
when the showAnnotations flag is used with doclava

Change-Id: I56e0b2060ed42cd0d077fff149d578d31c763f95
 2014-09-10 21:20:12 +00:00
Doug Zongker
d68530ba9a am 85448773: select default search_path by platform 
* commit '854487739933f7ff33980df0c65d2bcd03b049f9':
  select default search_path by platform
 2014-09-10 00:49:11 +00:00
Doug Zongker
8544877399 select default search_path by platform 
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
 2014-09-09 15:11:13 -07:00
Jeff Arneson
c4c8bcaf85 am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev 
* commit '5c980afc5eb78f8a2361e7eb9778345bdbe26a88':
  Show annotation information in generated documentation
 2014-09-08 17:00:37 +00:00
Jeff Arneson
5c980afc5e Merge "Show annotation information in generated documentation" into lmp-dev 2014-09-08 16:39:56 +00:00
Baligh Uddin
03f8a4dfb5 am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev 
* commit '4f3d31479d5e4e8d35e60de628417cb820d69f5e':
  Add java_args as a valid option
 2014-09-06 02:47:04 +00:00
Baligh Uddin
95c17467b7 am 1131d89b: Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools 
* commit '1131d89b426d7da401885d37a50a908c9f87d2a1':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
 2014-09-06 02:47:02 +00:00
Baligh Uddin
4f3d31479d Merge "Add java_args as a valid option" into klp-modular-dev 2014-09-06 02:19:37 +00:00
Baligh Uddin
f5085a8f94 Add java_args as a valid option 
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
(cherry picked from commit bdc2e3186f)
 2014-09-06 02:18:09 +00:00
Baligh Uddin
1131d89b42 Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools 
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
(cherry picked from commit 339ee4968a)
 2014-09-06 02:17:56 +00:00
Baligh Uddin
e0962d5a25 am bdc2e318: Add java_args as a valid option 
* commit 'bdc2e3186fc4ab22b9249d8e1b317a024e295c7f':
  Add java_args as a valid option
 2014-09-06 01:09:38 +00:00
Baligh Uddin
bdc2e3186f Add java_args as a valid option 
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
 2014-09-06 00:37:54 +00:00
Jeff Arneson
3a5cb1bd15 Show annotation information in generated documentation 
Display the annotations used to override @hide for classes in packages
and methods in classes.

Bug: 16848303
Change-Id: I5599e6593613edbbe6a002d5d46a0a6561dec55a
 2014-09-05 22:28:59 +00:00
Baligh Uddin
36ebce8f44 am 6b044131: Merge "Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools" into lmp-dev 
* commit '6b0441319a219fbc5296a81e9f653bd808cb095d':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
 2014-09-05 22:15:45 +00:00
Baligh Uddin
339ee4968a Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools 
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
 2014-09-05 18:29:47 +00:00
Doug Zongker
5b09b00b11 am 424296a4: add missing AOSP copyright notices 
* commit '424296a4e811f57ada27be68d60aeb5fcb1bb45b':
  add missing AOSP copyright notices
 2014-09-02 16:18:55 +00:00
Doug Zongker
424296a4e8 add missing AOSP copyright notices 
Change-Id: Idc812db30b259a55702f8728197f957f2d24d978
 2014-09-02 08:53:09 -07:00
Ricardo Cervera
688d83d42a am 2178358f: am 71346e66: am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS 
* commit '2178358f2f7dc7fc1748a2c3d3e39fade2bc40e0':
  docs: Changing adt bundle links to HTTPS
 2014-08-27 16:53:15 +00:00
Ricardo Cervera
2178358f2f am 71346e66: am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS 
* commit '71346e665f83bc80df5f32127639582387b100fd':
  docs: Changing adt bundle links to HTTPS
 2014-08-27 16:28:11 +00:00
Ricardo Cervera
71346e665f am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS 
* commit '14d6c100aa1926ec9e24c1f17e3aabba95141503':
  docs: Changing adt bundle links to HTTPS
 2014-08-27 16:16:15 +00:00
Ricardo Cervera
54d2ca33a3 docs: Changing adt bundle links to HTTPS 
Change-Id: I35c291bfef9a267aab5b8f108a6c6592c4f08750
 2014-08-27 08:48:49 -07:00
Doug Zongker
caec135f4a am ab7ca1d2: refactor BlockDifference into common 
* commit 'ab7ca1d2861e70d8ef8673d350b634111414039e':
  refactor BlockDifference into common
 2014-08-26 21:16:46 +00:00
Doug Zongker
6bf43ebd8d am 4d0bfb4f: remove unused xdelta3/xz utilities 
* commit '4d0bfb4f40496c607229b6c2bba723e7e315642e':
  remove unused xdelta3/xz utilities
 2014-08-26 21:16:45 +00:00
Doug Zongker
670e15e4ab am 5f9c28ca: fix build 
* commit '5f9c28cad4cc0b499837e91a8eea344c26264e32':
  fix build
 2014-08-26 21:16:44 +00:00
Doug Zongker
d391040444 am fc44a515: new block OTA system tools 
* commit 'fc44a515d46e6f4d5eaa0d32659b1cf3b9492305':
  new block OTA system tools
 2014-08-26 21:16:43 +00:00
Doug Zongker
ab7ca1d286 refactor BlockDifference into common 
Move BlockDifference into common and make its script generation code
more complete, so that it can be use by releasetools.py to do diffs on
baseband images.

Bug: 16984795
Change-Id: Iba9afc1c7755458ce47468b5170672612b2cb4b3
 2014-08-26 13:12:11 -07:00
Doug Zongker
4d0bfb4f40 remove unused xdelta3/xz utilities 
This was part of the original block-based OTA mechanism.

Bug: 16987495
Change-Id: I5bd6599829ee6084a8da1f0b14af87aabf07c130
 2014-08-26 13:11:56 -07:00
Doug Zongker
5f9c28cad4 fix build 
Change-Id: I1e503406129343bbfddacc1150c81e403b47778c
 2014-08-26 13:11:37 -07:00
Doug Zongker
fc44a515d4 new block OTA system tools 
Replace the xdelta/xz-based block OTA generation with a new system
based on the existing bsdiff/imgdiff tools.

Bug: 16984795
Change-Id: Ia9732516ffdfc12be86260b2cc4b1dd2d210e886
 2014-08-26 13:10:25 -07:00
Doug Zongker
fd1754a687 am 6f1d031b: take bootable images from target_files if present 
* commit '6f1d031b39ca2c666edab5ce966d1329f85dee1e':
  take bootable images from target_files if present
 2014-08-22 17:54:14 +00:00
Doug Zongker
6f1d031b39 take bootable images from target_files if present 
Now that we're building and saving images in the target_files at build
time, we should use those images instead of rebuilding them.

Bug: 17201052
Change-Id: I459e650f66f1e0bdf01ad54df9e34f36bf2ee899
 2014-08-22 10:25:57 -07:00
Geremy Condra
9a7bf7ede4 am 95ebe7a0: Use the specified verity key to sign boot and recovery OTA images. 
* commit '95ebe7a09b61931fc9e84b3ce43439c1eda40308':
  Use the specified verity key to sign boot and recovery OTA images.
 2014-08-21 02:48:14 +00:00
Geremy Condra
95ebe7a09b Use the specified verity key to sign boot and recovery OTA images. 
This ensures that when the verity key is rotated to a release key
both the boot and recovery images will be correctly signed. It does
mean that they will both be signed with the same key for now, but
as that doesn't change the threat model separating them is just a
distant nice-to-have.

Bug: 15725238
Change-Id: I5b75e4346fe0655065643ab553431690cc1a8cb0
 2014-08-20 20:17:01 +00:00
Geremy Condra
5b108e4632 am f19b365c: Add support for switching to verity release keys. 
* commit 'f19b365cc9021104586d65385d246db06639fc46':
  Add support for switching to verity release keys.
 2014-08-20 00:21:18 +00:00
Geremy Condra
f19b365cc9 Add support for switching to verity release keys. 
Bug: 15725238
Change-Id: I8f92210fd854b5a2567cf76aaecb5be02c3f9293
 2014-08-20 00:05:23 +00:00
Doug Zongker
10357eb5a2 am ad876835: Merge "save file block allocations in target_files" into lmp-dev 
* commit 'ad876835c4343a7c499d09bd90b9e79634b972e4':
  save file block allocations in target_files
 2014-08-13 00:27:59 +00:00
Doug Zongker
f21cb5a219 save file block allocations in target_files 
make_ext4fs can now output a file listing the blocks used for each
file in the image.  Request this file and save it in the target_files;
it will be used for future improvements to block OTAs.

Bug: 16984795
Change-Id: Id1e60465e3b5a9d126a7934b4d089cf34d8fec44
 2014-08-12 17:09:38 -07:00
Benoit Fradin
a45a8682fa BuildBootImage: Add secondstage image support [DO NOT MERGE] 
The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.

Bug: 17035158

Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Patrick Tjin <pattjin@google.com>
 2014-08-14 11:24:54 -07:00
Kenny Root
c2ed5ace0b am fdeb0ea6: am 68715d01: Merge "Add SignTos tool" 
* commit 'fdeb0ea673bd38b81c47504936030c62dd24a82d':
  Add SignTos tool
 2014-08-08 22:42:30 +00:00
Kenny Root
9221ce6705 Add SignTos tool 
Change-Id: Iac7db75cda383e333a55236c3678cd56f8245d6e
 2014-08-08 13:18:53 -07:00
Ying Wang
5a5d443f15 am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW" 
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW
 2014-08-08 03:26:07 +00:00
Kenny Root
cb73049485 am b12830aa: am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51" 
* commit 'b12830aa796496cbbaf058ccaa0c5c576722cb9f':
  Track bouncycastle upgrade to 1.51
 2014-08-07 20:01:41 +00:00
Kenny Root
bda807d3a1 Track bouncycastle upgrade to 1.51 
The new API in 1.51 will allow null return values.

Change-Id: I583690bf0740b2d0962f02edea3896e18626e548
 2014-08-07 12:11:47 -07:00
Ying Wang
594a10ae77 Consistent use of USE_MINGW 
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
 2014-08-07 20:08:04 -07:00
Brian Carlstrom
56ef86df84 resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp 
(cherry picked from commit 4a5a11e416)

Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253
 2014-08-06 17:47:40 -07:00
Colin Cross
372e0ed436 am 8381b988: Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev 
* commit '8381b988698bf891add85608648dfe1cc0c599bc':
  Revert "HACK: report CPU abi as 2nd arch if present"
 2014-08-05 22:40:01 +00:00
Doug Zongker
55cbe8b157 am f8340089: add 5 minute timeout on binary patch construction 
* commit 'f83400896de5e8bc2b21a0dce98382d9ed0ab537':
  add 5 minute timeout on binary patch construction
 2014-08-05 17:55:48 +00:00
Colin Cross
8381b98869 Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev 2014-08-05 17:41:31 +00:00
Colin Cross
ef77e517f7 Revert "HACK: report CPU abi as 2nd arch if present" 
This reverts commits 8179d4dcf6,
00c67a0568, and
d00c0a2e20.

Bug: 15933961
 2014-08-05 11:01:54 -07:00
Doug Zongker
f83400896d add 5 minute timeout on binary patch construction 
When making bsdiff/imgdiff patches, give up after 5 minutes.  (On
certain large files it can take hours to build a patch, if it ever
even completes.)

Change-Id: I123c06f8194f85f6f4e640f7eb31c7746f76ba4d
 2014-08-05 10:39:37 -07:00
Doug Zongker
9d03c1fdc4 am 56d91dd0: Merge "fall back to generating full OTA if incremental fails" into lmp-dev 
* commit '56d91dd07f96039344d6976da5d985d2508c9365':
  fall back to generating full OTA if incremental fails
 2014-08-04 23:17:43 +00:00
Doug Zongker
56d91dd07f Merge "fall back to generating full OTA if incremental fails" into lmp-dev 2014-08-01 17:53:35 +00:00