Colin Cross
8c6a66e959
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
2013-10-03 15:38:36 -07:00
Colin Cross
36e95f316f
Merge "don't check paths of non-installed or host modules" into klp-dev
2013-10-03 00:47:50 +00:00
Justin Koh
b49641c4fd
am 752cd60d: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
...
* commit '752cd60d468136d95b9a040eede9e5ff884820a4':
Move DownloadProviderUi from core_minimal to core.mk
2013-10-02 16:17:50 -07:00
Justin Koh
752cd60d46
Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
2013-10-02 23:13:18 +00:00
Colin Cross
86b0dfb2d0
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
2013-10-02 15:33:05 -07:00
Ying Wang
320a91d36a
am 9f615938: am 9a788285: Merge "Duplicate i686 target arch options for x86_64."
...
* commit '9f61593879325c987fc7593a5410bf3e0a535ff8':
Duplicate i686 target arch options for x86_64.
2013-10-02 15:06:03 -07:00
Ying Wang
6a6db9432f
am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"
...
* commit 'ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
x86_64: Adding new target
2013-10-02 15:06:02 -07:00
Ying Wang
9f61593879
am 9a788285: Merge "Duplicate i686 target arch options for x86_64."
...
* commit '9a78828590298001aacc425f9c0c8aae10366493':
Duplicate i686 target arch options for x86_64.
2013-10-02 15:02:52 -07:00
Ying Wang
ab7b53b8e0
am 5d92a933: Merge "x86_64: Adding new target"
...
* commit '5d92a933dcc1a9ddb99b8818c8a13e208ffc22ce':
x86_64: Adding new target
2013-10-02 15:02:51 -07:00
Ying Wang
9a78828590
Merge "Duplicate i686 target arch options for x86_64."
2013-10-02 22:00:26 +00:00
Ying Wang
5d92a933dc
Merge "x86_64: Adding new target"
2013-10-02 21:59:58 +00:00
Justin Koh
066375a869
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
2013-10-02 14:32:15 -07:00
Chris Wren
67107450fa
am d4b1d52b: support protos in host java libraries
...
* commit 'd4b1d52bb2970bbacfc5e45ba7692ce6e211fbc9':
support protos in host java libraries
2013-10-02 12:33:03 -07:00
Chris Wren
d4b1d52bb2
support protos in host java libraries
...
Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
2013-10-02 12:19:28 -07:00
Stephen Hines
147f66c1e8
Duplicate i686 target arch options for x86_64.
...
Change-Id: I94a18562c38a20bac526b348eb98c2aba67a431f
2013-10-02 11:35:29 -07:00
Ying Wang
913d2e787b
am 1a48f92d: am 164a9639: am 9e8b6c42: am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '1a48f92daa715b56df24422664cf1df2a548d496':
Allow to run checkbuild in sdk build.
2013-10-02 11:23:43 -07:00
Ying Wang
1a48f92daa
am 164a9639: am 9e8b6c42: am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
2013-10-02 11:14:56 -07:00
Ying Wang
164a963962
am 9e8b6c42: am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
2013-10-02 11:13:13 -07:00
Ying Wang
9e8b6c429d
am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
2013-10-02 11:11:13 -07:00
Ying Wang
3d48d9c36b
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit fcec57a116
)
2013-10-02 18:09:10 +00:00
Pavel Chupin
fd82a49e04
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>
2013-10-02 20:58:54 +04:00
Ying Wang
2ef85bd1ae
am d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
...
* commit 'd74b538d9a45e7698f5bbe10e3908f64b65eb81e':
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
2013-10-02 09:37:05 -07:00
Ben Gilad
1da0541b7b
am d7992e95: Replace a dangling refeence to packages/apps/Phone.
...
* commit 'd7992e95879535fbb7034c1f8e86460027f4ea04':
Replace a dangling refeence to packages/apps/Phone.
2013-10-02 09:35:16 -07:00
Ying Wang
d74b538d9a
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
2013-10-01 18:16:45 -07:00
Ben Gilad
d7992e9587
Replace a dangling refeence to packages/apps/Phone.
...
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
2013-09-30 16:54:17 -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
2acb1ea76d
Merge "SignApk: add argument for loading a Provider"
2013-09-25 21:37:17 +00:00
Ying Wang
4c7a2c1207
am 392d042c: am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
...
* commit '392d042c217b43d714e0bf5fe8f69cd2d0dbae90':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:40:29 -07:00
Baligh Uddin
92bf7dfe03
am 0ae6f769: am 55dc7844: am d21a641f: (-s ours) am fe66c390: bump version to 4.3.1
...
* commit '0ae6f769fa335f1bdb3edc7f91eba115b29d98bd':
bump version to 4.3.1
2013-09-25 12:40:28 -07:00
Ying Wang
392d042c21
am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
...
* commit 'b6da30c3724cc2a452be2c1ae425eff4f7d55944':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:37:19 -07:00
Baligh Uddin
0ae6f769fa
am 55dc7844: am d21a641f: (-s ours) am fe66c390: bump version to 4.3.1
...
* commit '55dc78446e4a3f8048d28bb78a7b9f2b988494bf':
bump version to 4.3.1
2013-09-25 12:37:18 -07:00
Ying Wang
b6da30c372
am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
...
* commit '2408479cf9cf9cfe87e464e9b5d2f36143818d37':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:35:04 -07:00
Baligh Uddin
55dc78446e
am d21a641f: (-s ours) am fe66c390: bump version to 4.3.1
...
* commit 'd21a641fb4c27fdba21b72116a4e5e722a7acf6f':
bump version to 4.3.1
2013-09-25 12:35:04 -07:00
Ying Wang
2408479cf9
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
2013-09-25 12:30:59 -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
085d3b5fdb
Merge "Read algorithm OID directly from PKCS#8 container"
2013-09-25 18:41:00 +00: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
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
Baligh Uddin
d21a641fb4
am fe66c390: bump version to 4.3.1
...
* commit 'fe66c390fb4068b380068a99311fdc42ae56dfa6':
bump version to 4.3.1
2013-09-23 15:54:41 -07:00
Baligh Uddin
fe66c390fb
bump version to 4.3.1
2013-09-23 15:05:45 -07:00