OSDN Git Service
Scott Main [Tue, 15 Oct 2013 02:00:51 +0000 (19:00 -0700)]
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
Kenny Root [Mon, 14 Oct 2013 21:13:44 +0000 (14:13 -0700)]
am
b0af7e51: am
cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit '
b0af7e5107abb17fc756044454b3a452d0dafb50':
Allow ECDSA signing OTA files
Kenny Root [Mon, 14 Oct 2013 21:10:05 +0000 (14:10 -0700)]
am
cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit '
cc68ce7012784a3d2ad12e041c8e82def74f20cd':
Allow ECDSA signing OTA files
Kenny Root [Mon, 14 Oct 2013 21:05:07 +0000 (21:05 +0000)]
Merge "Allow ECDSA signing OTA files"
Scott Main [Mon, 14 Oct 2013 20:17:46 +0000 (13:17 -0700)]
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
Scott Main [Mon, 14 Oct 2013 20:14:22 +0000 (13:14 -0700)]
am
3f4fcef5: am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
3f4fcef5830095ecd7360ee82c59ab6c41b5c826':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 14 Oct 2013 20:11:12 +0000 (13:11 -0700)]
am
25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit '
25c89dda9f416466f28f2fb2341d272ace709199':
enable auto-linking to next lesson with 'next-page-link' css class
Scott Main [Mon, 7 Oct 2013 21:17:55 +0000 (14:17 -0700)]
enable auto-linking to next lesson with 'next-page-link' css class
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
Ian Rogers [Sat, 12 Oct 2013 00:35:09 +0000 (17:35 -0700)]
am
09c6d68b: am
816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '
09c6d68b8879164f600bbe084a62cfbc4ab10850':
Specify -mcpu=cortex-a15 for krait CPU variants.
Ian Rogers [Sat, 12 Oct 2013 00:33:16 +0000 (17:33 -0700)]
am
816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '
816af5fc0e4cf8f705ba0ffbb2842b5d7432e653':
Specify -mcpu=cortex-a15 for krait CPU variants.
Ian Rogers [Sat, 12 Oct 2013 00:30:31 +0000 (00:30 +0000)]
Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
Ian Rogers [Fri, 11 Oct 2013 22:52:53 +0000 (15:52 -0700)]
Specify -mcpu=cortex-a15 for krait CPU variants.
Bug:
11178216
Change-Id: I9922e4cd5ba27e3857798aae5c84299e26e054ea
Kenny Root [Wed, 9 Oct 2013 22:00:14 +0000 (15:00 -0700)]
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
Ed Heyl [Tue, 8 Oct 2013 23:11:51 +0000 (16:11 -0700)]
am
b0ac4254: merge in KFS78N (no-op)
* commit '
b0ac42546f70cb46d614d318eb04c8cc45bd87b3':
"KFS78N"
KFS78M
KFS78L
KFS78K
"KFS78J"
KFS78I
Remove Email from HH FactoryROM Bug:
10806060
"KFS78H"
"KFS78G"
KFS78F
KFS78E
KFS78D
KFS78C
"KFS78B"
Ed Heyl [Tue, 8 Oct 2013 22:56:09 +0000 (15:56 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:45:47 +0000 (15:45 -0700)]
am
774e017e: merge in KQS81M
* commit '
774e017e6f21acf97c90f70dcb41c86efcb186de': (95 commits)
KQS81M
"KQS81L"
"KQS81K"
"KQS81J"
"KQS81I"
"KQS81H"
KQS81G
KQS81F
Remove Email from HH FactoryROM Bug:
10806060
KQS81E
"KQS81D"
"KQS81C"
KQS81B
"KQS83"
KRS81G
"KRS81F"
"KRS81E"
"KRS81D"
"KRS81C"
"KRS81B"
...
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:13:47 +0000 (15:13 -0700)]
am
e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit '
e652af1e808b2b15e23bc472f9be6592735a0a8e':
BoardConfig: Add and document vsync phase offset setting
Jamie Gennis [Tue, 8 Oct 2013 22:08:54 +0000 (22:08 +0000)]
Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
Ben Cheng [Tue, 8 Oct 2013 21:47:34 +0000 (14:47 -0700)]
am
0f324e3e: am
a7662295: Merge "Explictily specify the dynamic linker name."
* commit '
0f324e3e35f1d5d55c7c06ac6b76a6ce7726e015':
Explictily specify the dynamic linker name.
Ben Cheng [Tue, 8 Oct 2013 21:44:22 +0000 (14:44 -0700)]
am
a7662295: Merge "Explictily specify the dynamic linker name."
* commit '
a7662295438e50a22979a012c873e3d16444bc42':
Explictily specify the dynamic linker name.
Ben Cheng [Tue, 8 Oct 2013 21:42:32 +0000 (21:42 +0000)]
Merge "Explictily specify the dynamic linker name."
Ben Cheng [Tue, 8 Oct 2013 21:19:50 +0000 (14:19 -0700)]
Explictily specify the dynamic linker name.
Change-Id: Ie456f19cbe3dc8e3a9677638cc705b6eaf77c2b4
Dianne Hackborn [Tue, 8 Oct 2013 19:08:36 +0000 (12:08 -0700)]
am
6a4d3339: So long Key Lime Pie, it was nice knowing you.
* commit '
6a4d33390769d80113f16d383506dc9238e1d5fc':
So long Key Lime Pie, it was nice knowing you.
Elliott Hughes [Tue, 8 Oct 2013 17:12:28 +0000 (10:12 -0700)]
am
1180d71c: am
2c448765: Merge "Remove explicit passing of dynamic loader name"
* commit '
1180d71c3062a4f5b124ced3693a6a937ffbc13a':
Remove explicit passing of dynamic loader name
Elliott Hughes [Tue, 8 Oct 2013 17:10:51 +0000 (10:10 -0700)]
am
2c448765: Merge "Remove explicit passing of dynamic loader name"
* commit '
2c448765e1227327da7ce548114f13678baa9606':
Remove explicit passing of dynamic loader name
Elliott Hughes [Tue, 8 Oct 2013 17:09:03 +0000 (17:09 +0000)]
Merge "Remove explicit passing of dynamic loader name"
Pavel Chupin [Tue, 8 Oct 2013 07:35:39 +0000 (11:35 +0400)]
Remove explicit passing of dynamic loader name
We should trust toolchain on that.
Change-Id: I20dd882d167cc84c262aef245ea2d86c17bc1785
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Jamie Gennis [Sun, 6 Oct 2013 23:02:02 +0000 (16:02 -0700)]
BoardConfig: Add and document vsync phase offset setting
Bug:
10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
Ben Cheng [Mon, 7 Oct 2013 21:42:10 +0000 (14:42 -0700)]
am
0b42554f: am
12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '
0b42554fd8c7a43ca45504e4586f1eef578308de':
Add generic aarch64 board config and build rules.
Ben Cheng [Mon, 7 Oct 2013 21:40:42 +0000 (14:40 -0700)]
am
12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '
12eeb000601883256f306c2c6932cda4d768e97a':
Add generic aarch64 board config and build rules.
Ben Cheng [Mon, 7 Oct 2013 21:38:01 +0000 (21:38 +0000)]
Merge "Add generic aarch64 board config and build rules."
Ben Cheng [Fri, 4 Oct 2013 23:02:59 +0000 (16:02 -0700)]
Add generic aarch64 board config and build rules.
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
The Android Automerger [Mon, 7 Oct 2013 17:47:43 +0000 (10:47 -0700)]
KQS81M
Elliott Hughes [Fri, 4 Oct 2013 21:42:11 +0000 (14:42 -0700)]
am
a035abc5: am
1303aa28: Merge "Remove useless x86 options that were always hardcoded on."
* commit '
a035abc55455a50da7b242dad1bca55fa28617a9':
Remove useless x86 options that were always hardcoded on.
Elliott Hughes [Fri, 4 Oct 2013 21:40:14 +0000 (14:40 -0700)]
am
1303aa28: Merge "Remove useless x86 options that were always hardcoded on."
* commit '
1303aa28d579244794a9d419481720af866c7de4':
Remove useless x86 options that were always hardcoded on.
Elliott Hughes [Fri, 4 Oct 2013 21:37:46 +0000 (21:37 +0000)]
Merge "Remove useless x86 options that were always hardcoded on."
The Android Automerger [Fri, 4 Oct 2013 19:51:23 +0000 (12:51 -0700)]
"KQS81L"
Elliott Hughes [Fri, 4 Oct 2013 07:00:52 +0000 (00:00 -0700)]
Remove useless x86 options that were always hardcoded on.
ARCH_X86_HAVE_MMX, ARCH_X86_HAVE_SSE, ARCH_X86_HAVE_SSE2,
and ARCH_X86_HAVE_SSE3 were all always on. There are no longer any makefiles
or code that are conditional on any of these, so let's just remove them
rather than encourage anyone to mess with knobs that don't work.
Change-Id: I5ee095e8041eecff4554ad4801894fbfca69093f
Colin Cross [Thu, 3 Oct 2013 22:38:36 +0000 (15:38 -0700)]
am
36e95f31: Merge "don\'t check paths of non-installed or host modules" into klp-dev
* commit '
36e95f316f660f3cf32dbd47bbafba0e2ee56ad9':
don't check paths of non-installed or host modules
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Thu, 3 Oct 2013 01:42:40 +0000 (18:42 -0700)]
"KQS81K"
Colin Cross [Thu, 3 Oct 2013 00:47:50 +0000 (00:47 +0000)]
Merge "don't check paths of non-installed or host modules" into klp-dev
The Android Automerger [Wed, 2 Oct 2013 23:35:12 +0000 (16:35 -0700)]
"KQS81J"
Justin Koh [Wed, 2 Oct 2013 23:17:50 +0000 (16:17 -0700)]
am
752cd60d: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
* commit '
752cd60d468136d95b9a040eede9e5ff884820a4':
Move DownloadProviderUi from core_minimal to core.mk
Justin Koh [Wed, 2 Oct 2013 23:13:17 +0000 (23:13 +0000)]
Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
Colin Cross [Wed, 2 Oct 2013 22:16:35 +0000 (15:16 -0700)]
don't check paths of non-installed or host modules
Static libraries and host modules are not installed under
TARGET_OUT_VENDOR and don't need to be, relax the checks.
Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
Ying Wang [Wed, 2 Oct 2013 22:06:03 +0000 (15:06 -0700)]
am
9f615938: am
9a788285: Merge "Duplicate i686 target arch options for x86_64."
* commit '
9f61593879325c987fc7593a5410bf3e0a535ff8':
Duplicate i686 target arch options for x86_64.
Ying Wang [Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)]
am
ab7b53b8: am
5d92a933: Merge "x86_64: Adding new target"
* commit '
ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
x86_64: Adding new target
Ying Wang [Wed, 2 Oct 2013 22:02:52 +0000 (15:02 -0700)]
am
9a788285: Merge "Duplicate i686 target arch options for x86_64."
* commit '
9a78828590298001aacc425f9c0c8aae10366493':
Duplicate i686 target arch options for x86_64.
Ying Wang [Wed, 2 Oct 2013 22:02:51 +0000 (15:02 -0700)]
am
5d92a933: Merge "x86_64: Adding new target"
* commit '
5d92a933dcc1a9ddb99b8818c8a13e208ffc22ce':
x86_64: Adding new target
Ying Wang [Wed, 2 Oct 2013 22:00:26 +0000 (22:00 +0000)]
Merge "Duplicate i686 target arch options for x86_64."
Ying Wang [Wed, 2 Oct 2013 21:59:58 +0000 (21:59 +0000)]
Merge "x86_64: Adding new target"
Justin Koh [Wed, 2 Oct 2013 21:32:15 +0000 (14:32 -0700)]
Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.
Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
Chris Wren [Wed, 2 Oct 2013 19:33:03 +0000 (12:33 -0700)]
am
d4b1d52b: support protos in host java libraries
* commit '
d4b1d52bb2970bbacfc5e45ba7692ce6e211fbc9':
support protos in host java libraries
Chris Wren [Wed, 2 Oct 2013 17:30:27 +0000 (13:30 -0400)]
support protos in host java libraries
Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
Stephen Hines [Wed, 2 Oct 2013 18:35:29 +0000 (11:35 -0700)]
Duplicate i686 target arch options for x86_64.
Change-Id: I94a18562c38a20bac526b348eb98c2aba67a431f
Ying Wang [Wed, 2 Oct 2013 18:23:43 +0000 (11:23 -0700)]
am
1a48f92d: am
164a9639: am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
1a48f92daa715b56df24422664cf1df2a548d496':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:14:56 +0000 (11:14 -0700)]
am
164a9639: am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:13:13 +0000 (11:13 -0700)]
am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:11:13 +0000 (11:11 -0700)]
am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit
fcec57a1165dc78ca2630c017dd95bddce31e55a)
Pavel Chupin [Mon, 26 Nov 2012 05:50:07 +0000 (09:50 +0400)]
x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.
Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Ying Wang [Wed, 2 Oct 2013 16:37:05 +0000 (09:37 -0700)]
am
d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
* commit '
d74b538d9a45e7698f5bbe10e3908f64b65eb81e':
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
Ben Gilad [Wed, 2 Oct 2013 16:35:16 +0000 (09:35 -0700)]
am
d7992e95: Replace a dangling refeence to packages/apps/Phone.
* commit '
d7992e95879535fbb7034c1f8e86460027f4ea04':
Replace a dangling refeence to packages/apps/Phone.
Ying Wang [Wed, 2 Oct 2013 01:16:45 +0000 (18:16 -0700)]
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
only if the module is built against the platform, not the SDK.
Previously it added it if it's doing a platform build.
But we can do an apps_only build inside the platform source tree and
such a build may build modules against the platform.
This fixes the apps build in the platform source tree.
Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
The Android Automerger [Tue, 1 Oct 2013 04:00:24 +0000 (21:00 -0700)]
"KQS81I"
Ben Gilad [Mon, 30 Sep 2013 23:54:17 +0000 (16:54 -0700)]
Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
The Android Automerger [Sun, 29 Sep 2013 21:43:12 +0000 (14:43 -0700)]
"KFS78N"
The Android Automerger [Sun, 29 Sep 2013 20:33:42 +0000 (13:33 -0700)]
"KQS81H"
The Android Automerger [Sun, 29 Sep 2013 02:40:24 +0000 (19:40 -0700)]
KFS78M
The Android Automerger [Thu, 26 Sep 2013 05:14:47 +0000 (22:14 -0700)]
KQS81G
The Android Automerger [Thu, 26 Sep 2013 04:34:22 +0000 (21:34 -0700)]
KQS81F
Justin Ho [Thu, 19 Sep 2013 21:46:55 +0000 (14:46 -0700)]
Remove Email from HH FactoryROM
Bug:
10806060
Change-Id: I037f2886fbcdc6f444140b4ded3594a41ecefd1e
Kenny Root [Wed, 25 Sep 2013 21:41:54 +0000 (14:41 -0700)]
am
c80b7cda: am
2acb1ea7: Merge "SignApk: add argument for loading a Provider"
* commit '
c80b7cdaebfaeae1b95ad49b5a2782f9e5ee8727':
SignApk: add argument for loading a Provider
Kenny Root [Wed, 25 Sep 2013 21:39:48 +0000 (14:39 -0700)]
am
2acb1ea7: Merge "SignApk: add argument for loading a Provider"
* commit '
2acb1ea76d294f993993a0852c30dd93dc46c600':
SignApk: add argument for loading a Provider
Kenny Root [Wed, 25 Sep 2013 21:37:17 +0000 (21:37 +0000)]
Merge "SignApk: add argument for loading a Provider"
The Android Automerger [Wed, 25 Sep 2013 20:08:12 +0000 (13:08 -0700)]
KQS81E
Ying Wang [Wed, 25 Sep 2013 19:40:29 +0000 (12:40 -0700)]
am
392d042c: am
b6da30c3: am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
392d042c217b43d714e0bf5fe8f69cd2d0dbae90':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:40:28 +0000 (12:40 -0700)]
am
0ae6f769: am
55dc7844: am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
0ae6f769fa335f1bdb3edc7f91eba115b29d98bd':
bump version to 4.3.1
Ying Wang [Wed, 25 Sep 2013 19:37:19 +0000 (12:37 -0700)]
am
b6da30c3: am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
b6da30c3724cc2a452be2c1ae425eff4f7d55944':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:37:18 +0000 (12:37 -0700)]
am
55dc7844: am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
55dc78446e4a3f8048d28bb78a7b9f2b988494bf':
bump version to 4.3.1
Ying Wang [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
2408479cf9cf9cfe87e464e9b5d2f36143818d37':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
d21a641fb4c27fdba21b72116a4e5e722a7acf6f':
bump version to 4.3.1
Ying Wang [Tue, 24 Sep 2013 22:56:11 +0000 (15:56 -0700)]
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
With this change, you can install a shared library with module name foo
as bar.so to the system.img with:
LOCAL_INSTALLED_MODULE_STEM := bar.so
Note that we in general still disallow a static/shared library to
specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build
system uses LOCAL_MODULE to compute build time dependencies, such as
export_includes, the -l linker flag etc.
Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed
file name and if any other module links against this library, you may
run into runtime error: the library name baked in to the binary is not
the same as file name in the system image.
Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
Kenny Root [Wed, 25 Sep 2013 18:49:07 +0000 (11:49 -0700)]
am
c4b84239: am
085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
* commit '
c4b84239063082418f474707ac1dcc2270c8c698':
Read algorithm OID directly from PKCS#8 container
Kenny Root [Wed, 25 Sep 2013 18:45:30 +0000 (11:45 -0700)]
am
085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
* commit '
085d3b5fdbb1d02607ee107581c22c090082db65':
Read algorithm OID directly from PKCS#8 container
Kenny Root [Wed, 25 Sep 2013 18:41:00 +0000 (18:41 +0000)]
Merge "Read algorithm OID directly from PKCS#8 container"
Kenny Root [Wed, 25 Sep 2013 18:14:33 +0000 (11:14 -0700)]
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
Kenny Root [Wed, 25 Sep 2013 16:59:10 +0000 (09:59 -0700)]
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
Eino-Ville Talvala [Wed, 25 Sep 2013 01:11:14 +0000 (18:11 -0700)]
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.
Eino-Ville Talvala [Wed, 25 Sep 2013 01:09:20 +0000 (01:09 +0000)]
Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
Eino-Ville Talvala [Tue, 24 Sep 2013 23:57:28 +0000 (16:57 -0700)]
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
Kenny Root [Tue, 24 Sep 2013 18:10:47 +0000 (11:10 -0700)]
am
19ccb3a6: am
abc0bf08: Merge "SignApk: add support for EC keys"
* commit '
19ccb3a62a6024de0cfd984a97a85a51a45f028b':
SignApk: add support for EC keys
Kenny Root [Tue, 24 Sep 2013 18:07:58 +0000 (11:07 -0700)]
am
abc0bf08: Merge "SignApk: add support for EC keys"
* commit '
abc0bf084beea3251c042b28576c8f398749c80b':
SignApk: add support for EC keys
Kenny Root [Tue, 24 Sep 2013 18:04:57 +0000 (18:04 +0000)]
Merge "SignApk: add support for EC keys"
Dan Willemsen [Tue, 24 Sep 2013 17:43:54 +0000 (10:43 -0700)]
am
f47d5802: Don\'t check vendor path for phony packages
* commit '
f47d5802e627bf14cecc425b8c3e00e001c0f7c2':
Don't check vendor path for phony packages
Dan Willemsen [Tue, 24 Sep 2013 04:15:23 +0000 (21:15 -0700)]
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
Baligh Uddin [Mon, 23 Sep 2013 22:54:41 +0000 (15:54 -0700)]
am
fe66c390: bump version to 4.3.1
* commit '
fe66c390fb4068b380068a99311fdc42ae56dfa6':
bump version to 4.3.1
The Android Automerger [Mon, 23 Sep 2013 22:43:15 +0000 (15:43 -0700)]
"KQS81D"