Dianne Hackborn
a3fd7bf0c4
am 6a4d3339
: So long Key Lime Pie, it was nice knowing you.
...
* commit '6a4d33390769d80113f16d383506dc9238e1d5fc':
So long Key Lime Pie, it was nice knowing you.
2013-10-08 12:08:36 -07:00
Elliott Hughes
5dec2c7703
am 1180d71c
: am 2c448765
: Merge "Remove explicit passing of dynamic loader name"
...
* commit '1180d71c3062a4f5b124ced3693a6a937ffbc13a':
Remove explicit passing of dynamic loader name
2013-10-08 10:12:28 -07:00
Elliott Hughes
1180d71c30
am 2c448765
: Merge "Remove explicit passing of dynamic loader name"
...
* commit '2c448765e1227327da7ce548114f13678baa9606':
Remove explicit passing of dynamic loader name
2013-10-08 10:10:51 -07:00
Pavel Chupin
fde3c16420
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>
2013-10-08 11:35:39 +04:00
Ben Cheng
a698dab816
am 0b42554f
: am 12eeb000
: Merge "Add generic aarch64 board config and build rules."
...
* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
Add generic aarch64 board config and build rules.
2013-10-07 14:42:10 -07:00
Ben Cheng
0b42554fd8
am 12eeb000
: Merge "Add generic aarch64 board config and build rules."
...
* commit '12eeb000601883256f306c2c6932cda4d768e97a':
Add generic aarch64 board config and build rules.
2013-10-07 14:40:42 -07:00
Ben Cheng
12eeb00060
Merge "Add generic aarch64 board config and build rules."
2013-10-07 21:38:02 +00:00
Ben Cheng
db4fc200c4
Add generic aarch64 board config and build rules.
...
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
2013-10-07 13:58:27 -07:00
Elliott Hughes
2e840a500e
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.
2013-10-04 14:42:11 -07:00
Elliott Hughes
a035abc554
am 1303aa28
: Merge "Remove useless x86 options that were always hardcoded on."
...
* commit '1303aa28d579244794a9d419481720af866c7de4':
Remove useless x86 options that were always hardcoded on.
2013-10-04 14:40:14 -07:00
Elliott Hughes
d3f00c162b
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
2013-10-04 11:45:06 -07:00
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
Dianne Hackborn
6a4d333907
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
2013-10-03 12:30:00 -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
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
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
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
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
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
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
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
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
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
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
fe66c390fb
bump version to 4.3.1
2013-09-23 15:05:45 -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
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
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
Mike Lockwood
d90e2404dd
Add support for WITHOUT_CLANG
...
(cherry picked from commit 051a1740eb
)
Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f
2013-09-16 10:20:08 -07:00
Ying Wang
c5c32d8f4a
am fad629f4
: am 7f2ad751
: Merge "Switch x86 default compiler to multilib version"
...
* commit 'fad629f4dd07720b427c6a219ad93886e23ca277':
Switch x86 default compiler to multilib version
2013-09-14 13:49:15 -07:00
Ying Wang
fad629f4dd
am 7f2ad751
: Merge "Switch x86 default compiler to multilib version"
...
* commit '7f2ad751aebf9d13d63f20a451c28d4a41c4569a':
Switch x86 default compiler to multilib version
2013-09-14 13:47:03 -07:00
Ying Wang
7f2ad751ae
Merge "Switch x86 default compiler to multilib version"
2013-09-14 20:45:00 +00: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