Scott Main
011a38d184
am 2b205a58
: am 919edbe7
: am 1c094509
: am 6c030b73
: fix javadoc sidenav so it does not cutoff overflowing link names
...
* commit '2b205a5814c39d7b6e7c6646e3ec9da4dad6dcb8':
fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:23:45 -07:00
Scott Main
2b205a5814
am 919edbe7
: am 1c094509
: am 6c030b73
: fix javadoc sidenav so it does not cutoff overflowing link names
...
* commit '919edbe7761767c1ed3e3bb3715aa495908601c7':
fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:17:37 -07:00
Scott Main
6c030b7361
fix javadoc sidenav so it does not cutoff overflowing link names
...
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
2013-10-16 17:04:37 -07:00
Scott Main
c14c27af74
am a3362a7f
: am d19a1ff4
: am 3f4fcef5
: am 25c89dda
: enable auto-linking to next lesson with \'next-page-link\' css class
...
* commit 'a3362a7f67b87e89f5d82cf62f51d6b36be008fc':
enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 19:00:51 -07:00
Kenny Root
16d2dccd09
am b0af7e51
: am cc68ce70
: Merge "Allow ECDSA signing OTA files"
...
* commit 'b0af7e5107abb17fc756044454b3a452d0dafb50':
Allow ECDSA signing OTA files
2013-10-14 14:13:44 -07:00
Kenny Root
b0af7e5107
am cc68ce70
: Merge "Allow ECDSA signing OTA files"
...
* commit 'cc68ce7012784a3d2ad12e041c8e82def74f20cd':
Allow ECDSA signing OTA files
2013-10-14 14:10:05 -07:00
Scott Main
a3362a7f67
am d19a1ff4
: am 3f4fcef5
: am 25c89dda
: enable auto-linking to next lesson with \'next-page-link\' css class
...
* commit 'd19a1ff4b2c4a3c7d76ea94702776e8b2087d705':
enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 13:17:46 -07:00
Scott Main
25c89dda9f
enable auto-linking to next lesson with 'next-page-link' css class
...
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
2013-10-14 13:07:55 -07:00
Kenny Root
01ed66d2ba
Allow ECDSA signing OTA files
...
ECDSA works in the recovery verifier, so we can allow OTA updates to be
signed with EC keys.
Change-Id: If8f2be028843fbfd6c8c9c41b492605d9b5cbeb0
2013-10-09 15:00:24 -07:00
Kenny Root
2b983b2299
am c80b7cda
: am 2acb1ea7
: Merge "SignApk: add argument for loading a Provider"
...
* commit 'c80b7cdaebfaeae1b95ad49b5a2782f9e5ee8727':
SignApk: add argument for loading a Provider
2013-09-25 14:41:54 -07:00
Kenny Root
c80b7cdaeb
am 2acb1ea7
: Merge "SignApk: add argument for loading a Provider"
...
* commit '2acb1ea76d294f993993a0852c30dd93dc46c600':
SignApk: add argument for loading a Provider
2013-09-25 14:39:48 -07:00
Kenny Root
9f99cffb4e
am c4b84239
: am 085d3b5f
: Merge "Read algorithm OID directly from PKCS#8 container"
...
* commit 'c4b84239063082418f474707ac1dcc2270c8c698':
Read algorithm OID directly from PKCS#8 container
2013-09-25 11:49:07 -07:00
Kenny Root
c4b8423906
am 085d3b5f
: Merge "Read algorithm OID directly from PKCS#8 container"
...
* commit '085d3b5fdbb1d02607ee107581c22c090082db65':
Read algorithm OID directly from PKCS#8 container
2013-09-25 11:45:30 -07:00
Kenny Root
89c961aa11
SignApk: add argument for loading a Provider
...
For supporting loading a custom key type provider, add a -providerClass
argument that loads the selected JCE at the front of the provider list.
Change-Id: I3df16f7c570d36e08806b614d6f30c41cb117565
2013-09-25 11:37:52 -07:00
Kenny Root
62ea4a5c3c
Read algorithm OID directly from PKCS#8 container
...
The PKCS#8 PrivateKeyInfo structure has the algorithm OID encoded right
before the actual key octet stream is encoded. Use Bouncycastle to read
the OID for creation with the key factory.
This aids in the creation of custom key types that are backed by
hardware devices (e.g., HSMs) and have their own assigned OIDs.
Change-Id: If5d8fe07bc157e9bb5a3fb5f99091e924143105f
2013-09-25 09:59:10 -07:00
Kenny Root
842117daf3
am 19ccb3a6
: am abc0bf08
: Merge "SignApk: add support for EC keys"
...
* commit '19ccb3a62a6024de0cfd984a97a85a51a45f028b':
SignApk: add support for EC keys
2013-09-24 11:10:47 -07:00
Kenny Root
19ccb3a62a
am abc0bf08
: Merge "SignApk: add support for EC keys"
...
* commit 'abc0bf084beea3251c042b28576c8f398749c80b':
SignApk: add support for EC keys
2013-09-24 11:07:58 -07:00
Kenny Root
3d2365c068
SignApk: add support for EC keys
...
Change-Id: I09bc0e52fc84ec321b997016a8f97de1bfd2770d
2013-09-20 15:00:49 -07:00
Kenny Root
84f12ed9d8
am 13722ac8
: Merge "SignApk: update SignApk to support SHA256withRSA signing"
...
* commit '13722ac89f5512b932f13895217a6f861b77f57e':
SignApk: update SignApk to support SHA256withRSA signing
2013-09-20 14:20:24 -07:00
Doug Zongker
8562fd478d
SignApk: update SignApk to support SHA256withRSA signing
...
(cherry picked from commit c0581a02ed
)
Change-Id: I6212e0f3a6aa3265b111f0f7348b667af4a668b0
2013-09-20 13:14:32 -07:00
Scott Main
118cb04f92
am 00a218a9
: am 14e066d5
: am 4ec62cee
: am 40de3237
: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '00a218a9c818fd69b8f43b950109183d13f01296':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:09:33 -07:00
Scott Main
00a218a9c8
am 14e066d5
: am 4ec62cee
: am 40de3237
: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '14e066d5c8aedfad8b29b6784793f416af01e392':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:07:04 -07:00
Scott Main
40de323797
add support for custom <head> tags in each file with page.customHeadTag HDF var
...
Change-Id: I377910acec78c600d20cf10ca6aa706750107093
2013-09-20 09:09:40 -07:00
Scott Main
5a6e47bffb
am b7530442
: am a18b429f
: am fe340fac
: am e624b3fa
: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
...
* commit 'b7530442594903a0a0a9bb0b9cb41edc8c0de72b':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:03:33 -07:00
Scott Main
b753044259
am a18b429f
: am fe340fac
: am e624b3fa
: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
...
* commit 'a18b429fd3792b7c3fad2e0682aa39990b332c98':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:00:16 -07:00
Ying Wang
13871a8f50
resolved conflicts for merge of 65d5e788
to klp-dev-plus-aosp
...
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
Ying Wang
65d5e78865
am 4b7d8f11
: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
...
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:43:34 -07:00
Scott Main
e624b3fa47
update the init_google_navtree2 method to handle new format for sample nav tree data.
...
and update highlighting logic to handle hashtags
Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
2013-09-13 17:04:39 -07:00
Scott Main
cd2ced2375
am d9fa5580
: am 0c2b69d5
: am d6125b5e
: am 2552239a
: fix most of size problems of DAC on handsets. set device-width for viewport tag
...
* commit 'd9fa558056871433425746499d2bbf4e4d0fc92e':
fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:19:47 -07:00
Scott Main
d9fa558056
am 0c2b69d5
: am d6125b5e
: am 2552239a
: fix most of size problems of DAC on handsets. set device-width for viewport tag
...
* commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8':
fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:17:38 -07:00
Nick Kralevich
46f00b6167
am b5d4c0df
: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
...
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
Nick Kralevich
0eb17d9447
Update OTA to understand SELinux labels and capabilities
...
Update the OTA generation script to understand SELinux file
labels and file capabilities.
Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.
Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.
If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.
Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
Scott Main
2552239a52
fix most of size problems of DAC on handsets.
...
set device-width for viewport tag
Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
2013-09-09 18:51:49 -07:00
Dirk Dougherty
2c6124fd6f
am 00fcdfed
: am 0b345f58
: am 471f0cc8
: am 243ffc5b
: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
...
* commit '00fcdfede678c274675436d0008fc4a668ef711c':
Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 13:38:27 -07:00
Dirk Dougherty
00fcdfede6
am 0b345f58
: am 471f0cc8
: am 243ffc5b
: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
...
* commit '0b345f589691a774d04a698e80412c531c726f6c':
Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:51:52 -07:00
Dirk Dougherty
243ffc5bc2
Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
2013-09-06 18:41:44 +00:00
Dirk Dougherty
f2bd4eb26a
Build file breadcrumb from parentdirs keys, optionally linkify.
...
Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
2013-09-05 19:17:04 -07:00
Scott Main
85b2d38124
am 9a13b7a4
: am 76ff86cd
: am 5d9690e3
: am 4a9cc386
: remove prev/next links from API guides
...
* commit '9a13b7a416141c46ed032ef72990141925cc8aa3':
remove prev/next links from API guides
2013-09-05 17:09:50 -07:00
Scott Main
9a13b7a416
am 76ff86cd
: am 5d9690e3
: am 4a9cc386
: remove prev/next links from API guides
...
* commit '76ff86cd32927899cd6a2913d4eeb920806d0ae6':
remove prev/next links from API guides
2013-09-05 17:06:52 -07:00
Scott Main
4a9cc3864a
remove prev/next links from API guides
...
Change-Id: Ic80ec436a6ee1c7decc3a6fc8905f52a1b50ea6a
2013-09-05 16:29:14 -07:00
Scott Main
9e44e9f666
am 9cf09123
: am 07540873
: am eb23299b
: am 0ad622b4
: add ellipsis for overflowing strings in samples nav
...
* commit '9cf0912352163fb0c9a08221b44be23eccdffc15':
add ellipsis for overflowing strings in samples nav
2013-09-04 21:22:56 -07:00
Scott Main
9cf0912352
am 07540873
: am eb23299b
: am 0ad622b4
: add ellipsis for overflowing strings in samples nav
...
* commit '07540873614ac13d1352ab30e25ea8f1aabc4035':
add ellipsis for overflowing strings in samples nav
2013-09-04 21:21:30 -07:00
Scott Main
0ad622b4a6
add ellipsis for overflowing strings in samples nav
...
Change-Id: I1efcba409b068be0616eb2e3d80fadda301fd5f6
2013-09-04 21:14:06 -07:00
Dirk Dougherty
e8e90c3d58
am 49f58bb7
: am 70892395
: am d55fb681
: am 6fb7e23b
: Add file path above h1 in samplecode files.
...
* commit '49f58bb74ed7cb7038adbd98904c1bf594c45fc3':
Add file path above h1 in samplecode files.
2013-09-03 15:26:51 -07:00
Dirk Dougherty
49f58bb74e
am 70892395
: am d55fb681
: am 6fb7e23b
: Add file path above h1 in samplecode files.
...
* commit '70892395bb48ffca762a47c9bb35c1ad9c3512dc':
Add file path above h1 in samplecode files.
2013-09-03 15:25:08 -07:00
Dirk Dougherty
6fb7e23bba
Add file path above h1 in samplecode files.
...
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
2013-08-30 19:06:57 -07:00
Clay Murphy
6c6be899e0
am 5711d73e
: Merge "Docs: Fixing link from logo in PDK Bug: 9177537 Staging location: http://claym.mtv.corp.google.com:8083/guide/getting_started.html " into klp-dev
...
* commit '5711d73ed04e1c8d3c877565796a632c14a2b5fb':
Docs: Fixing link from logo in PDK Bug: 9177537 Staging location: http://claym.mtv.corp.google.com:8083/guide/getting_started.html
2013-08-28 08:59:19 -07:00
Clay Murphy
87aa83befb
Docs: Fixing link from logo in PDK
...
Bug: 9177537
Staging location:
http://claym.mtv.corp.google.com:8083/guide/getting_started.html
Change-Id: I4c4708a168688fdfc79468b955115d7f37df1bc2
2013-08-27 16:04:35 -07:00
Jianxun Zhang
098494981d
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
...
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:
'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'
This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.
The patch fixes this issue to get:
'--para', 'val1, '--para2', 'val2 is a string'
Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
2013-08-27 15:31:13 -07:00
Dirk Dougherty
fa35b2b3fb
am 5d2a0a0b
: am 13ab927a
: am 2747bec3
: am 981effcc
: Add breadcrumb for sample code html pages.
...
* commit '5d2a0a0ba7df0338e6dc1a4ee359abc69478553e':
Add breadcrumb for sample code html pages.
2013-08-26 15:04:29 -07:00