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
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
69d8f2d395
am bc13779d: hide the Helpouts recruitment banner
...
* commit 'bc13779d664a51efc0fb9ac489d2724cca2536fb':
hide the Helpouts recruitment banner
2014-11-04 02:38:42 +00:00
632070c940
hide the Helpouts recruitment banner
...
Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953
(cherry picked from commit bc13779d66
2014-11-04 02:30:38 +00:00
bc13779d66
hide the Helpouts recruitment banner
...
Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953
2014-11-03 18:28:17 -08:00
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
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
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
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
4244929faa
Merge "Doc change: increment the json import versions in docfile." into lmp-docs
2014-11-03 20:51:47 +00:00
f6e48da07f
Doc change: increment the json import versions in docfile.
...
Change-Id: I5ffd1810c83a333ae37e5d9c1b8dd0bdbd8cb376
2014-11-03 12:48:08 -08:00
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
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
f51f30d7f1
remove cookie expiration and add max-age of 2 years.
...
bug: 17781603
Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
2014-11-03 11:39:00 -08:00
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
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
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
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
17c0e73704
am ce915d95: Merge "Never use ASAN for acp."
...
* commit 'ce915d950aaea86e566c8aec06be181a65c17cf2':
Never use ASAN for acp.
2014-11-03 17:40:31 +00:00
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
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
aa898700b0
am 63f01de8: Add post-install verification phase
...
automerge: c9594af
2014-10-30 19:01:43 +00:00
c9594afa93
am 63f01de8: Add post-install verification phase
...
* commit '63f01de81892aa4e40b517464b3d9ca7db666c9d':
Add post-install verification phase
2014-10-29 18:51:51 +00:00
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
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
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
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
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
fb8886db68
get_stage in updater takes one param, not two.
...
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
2014-10-23 13:51:04 -07:00
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
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
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
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
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
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
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
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
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
327180f5d2
Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
2014-10-17 19:47:51 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
e070d7820d
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
...
automerge: 947f3e9
2014-10-17 08:33:52 +00:00
947f3e9ecf
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
2014-10-17 08:27:18 +00:00
77cf43e739
fix z-order of hangouts to avoid clobbering the search suggest
...
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
2014-10-17 01:21:13 -07:00
6b607ce33d
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
...
automerge: e321df0
2014-10-17 05:50:19 +00:00
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
c5b105a3a8
Merge "fix scroll offset when loading non-header pages" into lmp-dev
...
automerge: 19c6780
2014-10-17 05:34:36 +00:00
19c6780f9f
Merge "fix scroll offset when loading non-header pages" into lmp-dev
2014-10-17 05:18:08 +00:00
11fc009469
fix scroll offset when loading non-header pages
...
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
2014-10-16 22:10:00 -07:00
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: e0471a8https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 05:03:02 +00:00
06dbd2655c
Docs: Fixing link, adding Android Partner logo.
...
Bug: 17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d
2014-10-16 18:23:58 -07:00
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
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
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
88c15600b8
Doc change: update query params to force refresh of local js files.
...
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
2014-10-16 10:28:52 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c70ae57811
Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
2014-10-15 21:27:14 +00:00
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
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
9d641c41db
Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
2014-10-15 19:54:22 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
aec004e66c
resolved conflicts for merge of 1a856098 to lmp-mr1-dev
...
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
2014-10-09 13:58:05 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
83fadade5b
Doc change: increment queryparam to trigger cache flush on proxies.
...
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
2014-09-26 15:00:55 -07:00
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
ead20e6a9a
am 846cb3a9: add unit tests for rangelib
...
* commit '846cb3a9e628cb00088bf65a153c0fedc10f2621':
add unit tests for rangelib
2014-09-26 14:53:59 +00:00
95dfa81664
am 62338188: generate version 2 blockimgdiff files
...
* commit '623381880a32a2912f95949a6c406038ac4e7064':
generate version 2 blockimgdiff files
2014-09-26 14:53:58 +00:00
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
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
846cb3a9e6
add unit tests for rangelib
...
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
2014-09-25 16:39:32 -07:00
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
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
151c727736
Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
2014-09-25 03:45:50 +00:00
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
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
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
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
98f7742a7f
Merge "Move selection of C++ STL into the build system."
2014-09-18 23:51:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8544877399
select default search_path by platform
...
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
2014-09-09 15:11:13 -07:00
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
5c980afc5e
Merge "Show annotation information in generated documentation" into lmp-dev
2014-09-08 16:39:56 +00:00
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
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
4f3d31479d
Merge "Add java_args as a valid option" into klp-modular-dev
2014-09-06 02:19:37 +00:00
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
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
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
bdc2e3186f
Add java_args as a valid option
...
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
2014-09-06 00:37:54 +00:00
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
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
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
5b09b00b11
am 424296a4: add missing AOSP copyright notices
...
* commit '424296a4e811f57ada27be68d60aeb5fcb1bb45b':
add missing AOSP copyright notices
2014-09-02 16:18:55 +00:00
424296a4e8
add missing AOSP copyright notices
...
Change-Id: Idc812db30b259a55702f8728197f957f2d24d978
2014-09-02 08:53:09 -07:00
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
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
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
54d2ca33a3
docs: Changing adt bundle links to HTTPS
...
Change-Id: I35c291bfef9a267aab5b8f108a6c6592c4f08750
2014-08-27 08:48:49 -07:00
caec135f4a
am ab7ca1d2: refactor BlockDifference into common
...
* commit 'ab7ca1d2861e70d8ef8673d350b634111414039e':
refactor BlockDifference into common
2014-08-26 21:16:46 +00:00
6bf43ebd8d
am 4d0bfb4f: remove unused xdelta3/xz utilities
...
* commit '4d0bfb4f40496c607229b6c2bba723e7e315642e':
remove unused xdelta3/xz utilities
2014-08-26 21:16:45 +00:00
670e15e4ab
am 5f9c28ca: fix build
...
* commit '5f9c28cad4cc0b499837e91a8eea344c26264e32':
fix build
2014-08-26 21:16:44 +00:00
d391040444
am fc44a515: new block OTA system tools
...
* commit 'fc44a515d46e6f4d5eaa0d32659b1cf3b9492305':
new block OTA system tools
2014-08-26 21:16:43 +00:00
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
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
5f9c28cad4
fix build
...
Change-Id: I1e503406129343bbfddacc1150c81e403b47778c
2014-08-26 13:11:37 -07:00
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
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
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
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
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
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
f19b365cc9
Add support for switching to verity release keys.
...
Bug: 15725238
Change-Id: I8f92210fd854b5a2567cf76aaecb5be02c3f9293
2014-08-20 00:05:23 +00:00
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
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
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
c2ed5ace0b
am fdeb0ea6: am 68715d01: Merge "Add SignTos tool"
...
* commit 'fdeb0ea673bd38b81c47504936030c62dd24a82d':
Add SignTos tool
2014-08-08 22:42:30 +00:00
9221ce6705
Add SignTos tool
...
Change-Id: Iac7db75cda383e333a55236c3678cd56f8245d6e
2014-08-08 13:18:53 -07:00
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
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
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
594a10ae77
Consistent use of USE_MINGW
...
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
2014-08-07 20:08:04 -07:00
56ef86df84
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
...
(cherry picked from commit 4a5a11e416
2014-08-06 17:47:40 -07:00
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
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
8381b98869
Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
2014-08-05 17:41:31 +00:00
ef77e517f7
Revert "HACK: report CPU abi as 2nd arch if present"
...
This reverts commits 8179d4dcf600c67a0568d00c0a2e20
2014-08-05 11:01:54 -07:00
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
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
56d91dd07f
Merge "fall back to generating full OTA if incremental fails" into lmp-dev
2014-08-01 17:53:35 +00:00
62d4f18a30
fall back to generating full OTA if incremental fails
...
Block incremental OTA generation can currently fail on some
target-files pairs. Fall back to generating a full OTA so that the
script succeeds rather than failing.
Change-Id: Ide70395d1f3759aa2076bd173836f6a5e5b397c0
2014-08-04 16:06:43 -07:00
4c15eda124
am 285dd138: Merge "store images in target-files" into lmp-dev
...
* commit '285dd13885f3960a8b6d0225dcd72edef2d1a5ab':
store images in target-files
2014-08-01 13:50:32 +00:00
3c84f56948
store images in target-files
...
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.
- New script add_img_to_target_files is added to make the images and
add them to the IMAGES/ subdir in the target-files. It gets run
from the Makefile when building a target-files.
- img_from_target_files becomes mostly vestigial: it creates the
img.zip by just copying the images out of the target-files. (It
still knows how to build images for use on older target-files.)
- ota_from_target_files uses images from the target-files in
preference to rebuilding images from the source files.
- sign_apk_target_files builds images and includes them in its output
target files (even if the input target-files didn't have them).
Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
2014-07-31 11:06:30 -07:00
51e4698dc6
am 4365dcec: am 38868b9b: Merge "BuildBootImage: Add secondstage image support"
...
* commit '4365dcece2ee9a4e91c3556d4f9a88c1cbe98dbd':
BuildBootImage: Add secondstage image support
2014-07-31 17:31:08 +00:00
fb9076d9f2
BuildBootImage: Add secondstage image support
...
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.
Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-07-31 11:20:57 +00:00
4a5a11e416
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
...
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
2014-07-30 09:53:12 -07:00
dad2ab4df4
Add PROP_NAME_MAX validation
...
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
2014-07-29 16:13:18 -07:00
a961a09e59
Fix error: 'NoneType' object is not iterable
...
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
2014-07-29 11:42:37 -07:00
22717f9f9e
Signapk.java: hide the password
...
Reads the password through console instead of stdin directly and returns it as a string.
Change-Id: I52e525680b93e9729158f4902b22f985245dbf2f
Signed-off-by: zhang jun <jun.zhang@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
2014-07-17 18:13:51 +08:00
9384878820
am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '81415adad38fe06f50f381d6317ca0b93848e095':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:29:09 +00:00
ba6dc7272c
am 93848788: am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '9384878820ec7c881fdf054e8a0a88b2d1b94f64':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:36:20 +00:00
9c5564e060
Fix incremental builds for SDK.
...
Atree used to output files without escaping the filenames. This resulted
in breaks for incremental builds when filenames contained '$' symbol.
The change fixes this by escaping the filename properly.
Change-Id: I957787b1b3536c64ba6fcb5b4bb5fc60e8b04452
2014-07-15 17:26:56 -07:00
81415adad3
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
2014-07-15 11:38:40 -07:00
f3bcb2d4c3
Merge "Added support for building verified vendor partition" into lmp-dev
2014-07-14 18:38:02 +00:00
f4eabc3961
Added support for building verified vendor partition
...
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
8179d4dcf6
HACK: use CPU_ABI hack only for arm64
...
The previous hack breaks x86_64, use it only for arm64.
Bug: 15018047
Bug: 16116257
Change-Id: Ia11f237590f7f3c7bc6a25208415b86240d2d6be
2014-07-14 12:51:52 -07:00
fed4c5ca5a
Merge "Add Zopfli-recompress option to zipalign"
2014-07-10 20:54:59 +00:00
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
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
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
90c66cff3a
ADBS now uses stack_core code to parse traces.
...
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
00c67a0568
Fix typo.
...
Bug: 15978907
Bug: 15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
2014-06-30 18:01:46 -07:00
1207d5e02b
Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"
2014-06-27 15:56:14 +00:00
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
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
236738439a
Doc change: add query param to force refresh in proxy caches.
...
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
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
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
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
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
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
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
28d695a005
css changes for index page card
...
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
2014-06-25 22:50:49 -07:00
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
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
5771ee3c41
add style for stand-alone back link with left arrow
...
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
2014-06-25 15:12:52 -07:00
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
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
Dirk Dougherty