Commit graph

2558 commits

Author SHA1 Message Date
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
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