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
085d3b5fdb
Merge "Read algorithm OID directly from PKCS#8 container"
2013-09-25 18:41:00 +00: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
Eino-Ville Talvala
28db7b46dd
am ac079b1d
: Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
...
* commit 'ac079b1da45431197cc9d821bf2234d2e65f28a9':
Add android-ex-camera2 static java library to PDK.
2013-09-24 18:11:14 -07:00
Eino-Ville Talvala
ac079b1da4
Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
2013-09-25 01:09:20 +00:00
Eino-Ville Talvala
735bba8be0
Add android-ex-camera2 static java library to PDK.
...
Library is located frameworks/ex/camera2/public.
This is required to allow pdk/apps/CameraITS to build in the PDK.
Bug: 10337323
Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
2013-09-24 16:57:28 -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
abc0bf084b
Merge "SignApk: add support for EC keys"
2013-09-24 18:04:57 +00:00
Dan Willemsen
b885894123
am f47d5802
: Don\'t check vendor path for phony packages
...
* commit 'f47d5802e627bf14cecc425b8c3e00e001c0f7c2':
Don't check vendor path for phony packages
2013-09-24 10:43:54 -07:00
Dan Willemsen
f47d5802e6
Don't check vendor path for phony packages
...
These don't get installed, so they don't need to be in TARGET_OUT_VENDOR
Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32
2013-09-24 10:30:35 -07:00
Kenny Root
3d2365c068
SignApk: add support for EC keys
...
Change-Id: I09bc0e52fc84ec321b997016a8f97de1bfd2770d
2013-09-20 15:00:49 -07:00
Kenny Root
ea835c9c82
am 84f12ed9
: am 13722ac8
: Merge "SignApk: update SignApk to support SHA256withRSA signing"
...
* commit '84f12ed9d8cf24cdc937d761bbc768db0abb30d6':
SignApk: update SignApk to support SHA256withRSA signing
2013-09-20 14:22:12 -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
Kenny Root
13722ac89f
Merge "SignApk: update SignApk to support SHA256withRSA signing"
2013-09-20 21:18:45 +00: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
14e066d5c8
am 4ec62cee
: am 40de3237
: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '4ec62ceeac20522101ddd9baaddb3ee26db8a9f2':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:04:27 -07:00
Scott Main
4ec62ceeac
am 40de3237
: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '40de323797294ae4c6f41c958df9ef81cfa33ecb':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:01:06 -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
Brian Carlstrom
a0cf24a805
am 71fc41df
: Enable art for user builds
...
* commit '71fc41df1eea345949e8e838b573ac367a52f9c7':
Enable art for user builds
2013-09-19 16:03:32 -07:00
Brian Carlstrom
71fc41df1e
Enable art for user builds
...
Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
2013-09-19 15:07:28 -07:00
Ying Wang
4a712bfb6f
resolved conflicts for merge of 70190a2b
to klp-dev-plus-aosp
...
Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369
2013-09-19 10:15:38 -07:00
Ying Wang
70190a2b02
am b71677b1
: Merge "Extend x86 to have different arch variants"
...
* commit 'b71677b17cc0100caf16209bfcd1eee529e2eb5a':
Extend x86 to have different arch variants
2013-09-19 09:47:27 -07:00
Ying Wang
b71677b17c
Merge "Extend x86 to have different arch variants"
2013-09-19 16:45:16 +00:00
Negreanu Marius Adrian
ae5c0ab272
Extend x86 to have different arch variants
...
Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com>
Author: Andrew Boie <andrew.p.boie@intel.com>
Author: Daniel Leung <daniel.leung@intel.com>
Currently, x86 target only has generic i686 and x86-atom
as arch variants. This patch adds the ability to have
more than two arch variants. Defining a new arch variant
is similiar to ARM targets, by adding a new file in
core/combo/arch/x86. These files also define what
capabilities the targeting CPU has (e.g. having SSE2,
SSE3, etc.).
We define arch variants for Sandy Bridge, Ivy Bridge,
Haswell; upcoming arches can be easily added to this
set with future patches.
Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-09-18 14:14:22 -07:00
Ying Wang
e77e93c658
am eca25767
: am ba164eb1
: Merge "Remove unnecessary dependencies between host and target modules."
...
* commit 'eca25767aed8262cd32fb31c93b2fde642d867d2':
Remove unnecessary dependencies between host and target modules.
2013-09-18 09:06:52 -07:00
Ying Wang
eca25767ae
am ba164eb1
: Merge "Remove unnecessary dependencies between host and target modules."
...
* commit 'ba164eb138a27cb7c8b5bc990b633ef954cc0f1b':
Remove unnecessary dependencies between host and target modules.
2013-09-18 09:04:07 -07:00
Ying Wang
ba164eb138
Merge "Remove unnecessary dependencies between host and target modules."
2013-09-18 16:02:03 +00:00
Ying Wang
293ad10d25
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-09-18 09:01:03 -07:00
Brian Carlstrom
cd3641fab2
am 24cffbac
: Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
...
* commit '24cffbac65dfc1dd17f45dc008abc36140c81032':
Add oatdump for ART to go with dexdump for Dalvik
2013-09-17 23:43:55 -07:00
Brian Carlstrom
24cffbac65
Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
2013-09-18 06:41:37 +00:00
Jean-Michel Trivi
9532dca41f
am 22b85cc1
: Merge "Add loudness enhancer to platform" into klp-dev
...
* commit '22b85cc1144b0710a611ac8e0568b73fe3a52368':
Add loudness enhancer to platform
2013-09-17 18:53:08 -07:00
Jean-Michel Trivi
22b85cc114
Merge "Add loudness enhancer to platform" into klp-dev
2013-09-18 01:48:35 +00:00
Brian Carlstrom
0354c908e2
Add oatdump for ART to go with dexdump for Dalvik
...
Bug: 10807447
Change-Id: I48d1bc0ca025215383161dbf160d4f9270d97496
2013-09-17 18:29:29 -07:00
Ying Wang
0d78b7619e
am 7d153833
: am a85afdb8
: Merge "Add support for WITHOUT_CLANG"
...
* commit '7d153833d8002c824af9c8904be6b1765e864445':
Add support for WITHOUT_CLANG
2013-09-16 13:43:32 -07:00
Ying Wang
7d153833d8
am a85afdb8
: Merge "Add support for WITHOUT_CLANG"
...
* commit 'a85afdb83d4d9d0fb03024eee9937b0882dd81ad':
Add support for WITHOUT_CLANG
2013-09-16 13:40:49 -07:00
Ying Wang
a85afdb83d
Merge "Add support for WITHOUT_CLANG"
2013-09-16 20:38:29 +00:00
Michael Jurka
c0db1fb812
am f52651ef
: Merge "Add default WallpaperCropper to the build" into klp-dev
...
* commit 'f52651ef2791292ba6c50f98a6558e9e0a3b0b61':
Add default WallpaperCropper to the build
2013-09-16 12:16:53 -07:00
Michael Jurka
f52651ef27
Merge "Add default WallpaperCropper to the build" into klp-dev
2013-09-16 19:13:56 +00:00
Scott Main
555477380c
am 1a1bcae3
: am 8b4e768f
: am 013bf8c8
: am e48657b2
: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
...
* commit '1a1bcae35d8354714268b186551d8bff279cb5d2':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-16 11:07:11 -07:00
Scott Main
1a1bcae35d
am 8b4e768f
: am 013bf8c8
: am e48657b2
: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
...
* commit '8b4e768ffd159772ed064a948433028f1e39a386':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-16 11:05:17 -07:00
Scott Main
8b4e768ffd
am 013bf8c8
: am e48657b2
: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
...
* commit '013bf8c8c46b844eb58e376b3a45ecfa4f5f4763':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-16 11:03:15 -07:00
Scott Main
013bf8c8c4
am e48657b2
: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
...
* commit 'e48657b2aeac15b522e5ba60e4719844e2d8183f':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-16 11:01:54 -07:00
Jeff Sharkey
6c4acc1135
am f8068c2f
: Remove Terminal for now.
...
* commit 'f8068c2fbcd149547f4c6e35a091745927712a22':
Remove Terminal for now.
2013-09-16 10:45:09 -07:00
Scott Main
e48657b2ae
Revert "remove renderscript support lib from javadocs"
...
... put support lib javadocs for renderscript back in.
This reverts commit 5b743677eb
.
Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
(cherry picked from commit 27597c4d8e
)
2013-09-16 17:42:00 +00:00
Jeff Sharkey
f8068c2fbc
Remove Terminal for now.
...
Bug: 10780928
Change-Id: Iab3991e8d7df7d29e108e389ea18702c5e7efa25
2013-09-16 10:37:36 -07:00
Mike Lockwood
d90e2404dd
Add support for WITHOUT_CLANG
...
(cherry picked from commit 051a1740eb
)
Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f
2013-09-16 10:20:08 -07:00