Commit graph

3444 commits

Author SHA1 Message Date
Eino-Ville Talvala
8dcb53c691 am 28db7b46: am ac079b1d: Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
* commit '28db7b46dd8c96813ac7d548c7344b4f3bcb4f44':
  Add android-ex-camera2 static java library to PDK.
2013-09-24 18:12:56 -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
Ying Wang
feb75860ff 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-24 16:09:54 -07:00
Dan Willemsen
93ec84d57f am b8858941: am f47d5802: Don\'t check vendor path for phony packages
* commit 'b885894123aa93250238f2437f3f70b25c9d1872':
  Don't check vendor path for phony packages
2013-09-24 10:46:52 -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
Brian Carlstrom
e7648fe4f5 am a0cf24a8: am 71fc41df: Enable art for user builds
* commit 'a0cf24a8055a84e30b5eb5d54067eb99d731b749':
  Enable art for user builds
2013-09-20 11:20:15 -07:00
Stephen Hines
d2ecb3de3a Switch from HOST->BUILD for other LLVM components.
Bug: 10653601
Change-Id: Ia841c760da6f864df6ae76e5a07bc1d307198691
2013-09-19 16:06:22 -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
Stephen Hines
475d366d5c Merge "Switch to using BUILD instead of HOST variables." 2013-09-19 21:27:07 +00:00
Stephen Hines
2912425fc1 Merge "Enable prebuilt host LLVM." 2013-09-19 19:45:24 +00:00
Stephen Hines
09e27f1afc Switch to using BUILD instead of HOST variables.
This fixes issues where we cross-compile Windows binaries on a Linux host.

Change-Id: Ief6558bf9a565b6df7b63207f6e92ef272066463
2013-09-19 12:43:00 -07:00
Ying Wang
9eae1e6cae am 4a712bfb: resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp
* commit '4a712bfb6f2e93287bacc348c8513d9b0da7cfcc':
  Extend x86 to have different arch variants
2013-09-19 10:20:20 -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
Stephen Hines
578a84dc45 Enable prebuilt host LLVM.
Bug: 10653601

Change-Id: Ie127f9e78ea9b90b2243e15d9f933c46a4896542
2013-09-18 17:10:26 -07: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
Ben Cheng
670b8d2251 Switch ARM platform toolchain to GCC 4.8.
Change-Id: If08cfb2b9d86c08d3b658470440242b0af4d9916
2013-09-17 09:35:14 -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
80abb45648 am c5c32d8f: am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit 'c5c32d8f4a202f19a967678c283e71b75d1061c8':
  Switch x86 default compiler to multilib version
2013-09-14 13:53:48 -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
4742d055ae Use llvm components built from source for now
Change-Id: I2ba3e81199b95d827dd2960180dda6070fe9ea24
2013-09-14 12:04:43 -07:00
Stephen Hines
c301fb56ff Switch to a different set of header includes for prebuilt host Clang.
Bug: 10653601
Change-Id: I94ebd75847580ee77df57825c2325b164b77f9da
2013-09-14 00:07:22 -07:00
Stephen Hines
75fbea66a5 Merge "Create initial rules for using Clang/LLVM HOST prebuilts." 2013-09-14 05:36:45 +00:00
Ying Wang
717ee5ab0e am 13871a8f: resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
* commit '13871a8f500b0f9a5e167be3487c1e8d1f92f327':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:56:51 -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
Ying Wang
4b7d8f119a Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS" 2013-09-14 00:41:30 +00:00
Ying Wang
8639f2dda2 am 3057adba: Drop the [no]proguard. prefix for the intermediate targets
* commit '3057adbace1eb57cd73f982eb06d897632ece554':
  Drop the [no]proguard. prefix for the intermediate targets
2013-09-12 21:37:25 -07:00
Stephen Hines
ed2b7b349a Create initial rules for using Clang/LLVM HOST prebuilts.
Bug: 10653601

Use FORCE_BUILD_LLVM_COMPONENTS=true to re-enable the traditional
LLVM HOST build.

Change-Id: I3d0891edd4818eb685641ef5d0068cd152470e5c
2013-09-12 20:36:28 -07:00
Ying Wang
3057adbace Drop the [no]proguard. prefix for the intermediate targets
Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-12 17:50:11 -07:00
Ying Wang
193bb2cd74 Merge "Drop the [no]proguard. prefix for the intermediate targets" 2013-09-13 00:48:21 +00:00
Ying Wang
7b7929ad38 Drop the [no]proguard. prefix for the intermediate targets
Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-12 17:35:21 -07:00
Scott Main
1a2709f05f add renderscript to the support lib javadocs
this is a round-about change to handle conflict from Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1

Change-Id: Iac5f91e52c1a962abb26864bac9343657a8cf9b6
2013-09-12 16:47:05 -07:00
Scott Main
0e50619ad2 am 3938f3e1: am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '3938f3e1af045e887735884b059224a86f46db74':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:19:36 -07:00
Scott Main
3938f3e1af am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:17:26 -07:00
Scott Main
7cba6168c3 am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:16:02 -07:00
Scott Main
9a3fb8711f Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev 2013-09-12 19:14:19 +00:00
Kenny Root
ecbc22ead1 am 43077645: Merge "Add libcore.conscrypt tests back to CTS"
* commit '43077645b5ade27fafff808f11539f6a3e176544':
  Add libcore.conscrypt tests back to CTS
2013-09-12 11:55:42 -07:00
Scott Main
27597c4d8e Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.

This reverts commit 5b743677eb.

Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
2013-09-12 18:45:05 +00:00
Kenny Root
6dc9e43c05 resolved conflicts for merge of f913c2dd to master
Change-Id: Ie070cae60e0c78778d42fda30599df95d9532b5b
2013-09-12 09:56:31 -07:00
Kenny Root
ebf1a97a67 Add libcore.conscrypt tests back to CTS
A reorganization of the libcore test jar files caused the Conscrypt
tests to be accidentally dropped from CTS. Add them back in their own
package.

(cherry picked from commit 69c00c9ee8)

Bug: 10210673
Change-Id: I5ffc62736d3dab7e96e480c593e07d6c640b8950
2013-09-12 09:48:13 -07:00