Commit graph

15771 commits

Author SHA1 Message Date
Dan Albert
50031de36e Remove -Bsymbolic from builds.
This is causing issues when tools like asan try to wrap calls like
malloc. See the referenced bug for more details.

Bug: 15432753
Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
2014-06-13 10:24:12 -07:00
Ying Wang
cc2a47bf64 Merge "Check existence of both 64-bit and 32-bit module variants." 2014-06-10 22:20:24 +00:00
Ying Wang
ff3a904522 Check existence of both 64-bit and 32-bit module variants.
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang
b2ba5636f1 Merge "Revert "Don't rename host libraries if only one arch is build."" 2014-06-10 22:08:45 +00:00
Ying Wang
532f1127af Revert "Don't rename host libraries if only one arch is build."
This reverts commit b1f7fb7a50.

Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
2014-06-11 01:12:18 +00:00
Ying Wang
b1f7fb7a50 Don't rename host libraries if only one arch is build.
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.

Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
2014-06-10 17:18:08 -07:00
Ying Wang
c34f37c7b5 Merge "Allow to opt out both multilib in native test." 2014-06-10 22:15:14 +00:00
Ying Wang
ad10cc76b6 Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.

Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
2014-06-10 17:52:20 -07:00
Ying Wang
a45a5d2797 Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted" 2014-06-10 22:15:14 +00:00
Ying Wang
6e85f8b0de Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.

Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
2014-06-10 16:24:31 -07:00
Ying Wang
cec9dc1418 Merge "Don't rename host libraries if only one arch is build." 2014-06-10 22:15:14 +00:00
Ying Wang
02f98a26c9 Merge "Fix loophole in module expansion." 2014-06-10 21:59:54 +00:00
Ying Wang
e1b867dde7 Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00
Ying Wang
6cc4598d18 Merge "Add global variable HOST_LIBRARY_PATH." 2014-06-10 20:31:23 +00:00
Elliott Hughes
47cdacd5e6 Merge "Remove libportable from core_base.mk." 2014-06-10 19:23:53 +00:00
Elliott Hughes
4e8c6991e5 Remove libportable from core_base.mk.
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
2014-06-10 12:19:01 -07:00
Ying Wang
c4595868c4 Add global variable HOST_LIBRARY_PATH.
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
  version the librareies are built by default, use HOST_LIBRARY_PATH.

Bug:13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
2014-06-10 12:04:56 -07:00
Ying Wang
c383862020 Merge "Switch to 32-bit-by-default host multilib build." 2014-06-10 16:26:42 +00:00
Ying Wang
2713fcebba Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.

Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
2014-06-09 17:48:05 -07:00
Ying Wang
c02752473f Merge "build native tests for 32-bit and 64-bit" 2014-06-09 22:53:00 +00:00
Ying Wang
5ad17493cd Merge "Support .asm being compiled by yasm targeted for x86." 2014-06-09 21:43:56 +00:00
Stephen Hines
1a8f0d3b6d Merge "Move comment out of recipe section" 2014-06-06 21:07:25 +00:00
Stephen Hines
8ff9252680 Move comment out of recipe section
If we keep a comment in the recipe, it prints out whenever that component
gets built.

Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
2014-06-06 12:51:47 -07:00
Ying Wang
d0f0918b8f Merge "Reenable ccache." 2014-06-06 18:21:09 +00:00
Ying Wang
67ed25f3a6 Reenable ccache.
The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
2014-06-06 11:18:04 -07:00
Ying Wang
7b913ce6fa Support .asm being compiled by yasm targeted for x86.
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
2014-06-06 11:00:36 -07:00
Tim Murray
e564c0cbd0 Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 2014-06-04 19:00:38 +00:00
Qiwen Zhao
e8e7ebbde4 Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
This reverts commit a5abefbbb5.
2014-06-04 11:21:21 -07:00
Qiwen Zhao
a5abefbbb5 Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
This reverts commit 0ced06ea0f.
2014-06-04 10:02:29 -07:00
Steve Moyer
37773821f1 DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:41:24 -07:00
Steve Moyer
008dc16cb0 DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:38:32 -07:00
Stephen Hines
5339640da6 Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
2014-06-03 18:28:44 -07:00
Primiano Tucci
1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Ying Wang
7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:22:51 +00:00
Ying Wang
40b7e34240 Merge "Move sdk staging dir to a product-specific dir" 2014-06-03 01:20:30 +00:00
Ying Wang
d7af176199 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
2014-06-02 16:16:53 -07:00
Nick Kralevich
333005f1bf am c706ea79: Merge "Include selinux_version file with builds."
* commit 'c706ea79629792f4432774643887f5681e8f145d':
  Include selinux_version file with builds.
2014-06-02 19:25:21 +00:00
Nick Kralevich
c706ea7962 Merge "Include selinux_version file with builds." 2014-06-02 19:23:12 +00:00
Primiano Tucci
994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-02 20:12:57 +01:00
Stephen Hines
85e0dce5f4 am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit 'a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
  Add -shared to clang LDFLAGS.
2014-05-30 23:04:37 +00:00
Stephen Hines
a8b65126ca Merge "Add -shared to clang LDFLAGS." 2014-05-30 22:59:48 +00:00
Nick Kralevich
329988c277 am a42e0f50: Merge "arm64: restore relro/now"
* commit 'a42e0f50162721bc54c113ef1ed3058cfb38ae67':
  arm64: restore relro/now
2014-05-30 22:56:11 +00:00
Nick Kralevich
a42e0f5016 Merge "arm64: restore relro/now" 2014-05-30 22:52:35 +00:00
Nick Kralevich
45545761d2 arm64: restore relro/now
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
2014-05-30 15:46:40 -07:00
Nick Kralevich
1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
2014-05-30 18:23:41 +00:00
Nick Kralevich
61cf065ae9 Merge "Use a separate policy for the recovery image." 2014-05-30 18:20:48 +00:00
Andrew Hsieh
dc41aa3254 am 5c2c70de: Merge "Add -latomic to all target builds"
* commit '5c2c70de88a6c126460c88cfa64561d7cb2cc030':
  Add -latomic to all target builds
2014-05-30 07:46:14 +00:00
Andrew Hsieh
5c2c70de88 Merge "Add -latomic to all target builds" 2014-05-30 07:44:02 +00:00
Tim Murray
0f9276d4ba Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.

Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
2014-05-29 17:54:07 -07:00
Stephen Smalley
5520f28653 Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.

Depends on the change with the same Change-Id in external/sepolicy.

Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-29 16:42:49 -04:00