Elliott Hughes
53caaaf6f8
am 0f41ad79
: am 1ffda9be
: Merge "Remove unused hosts."
...
* commit '0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
Remove unused hosts.
2014-06-16 22:23:27 +00:00
Elliott Hughes
bfe62fc30c
Remove unused hosts.
...
Nobody is using freebsd-x86 or linux-ppc.
Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
2014-06-16 14:48:59 -07:00
Ying Wang
4d386c8e04
am 13a476c4
: am 2f1f30a9
: Merge "Trim down BUILD_FINGERPRINT."
...
* commit '13a476c40c0354220829efe29224845da78b6326':
Trim down BUILD_FINGERPRINT.
2014-06-16 16:33:45 +00:00
Ying Wang
5181a36bce
Trim down BUILD_FINGERPRINT.
...
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Elliott Hughes
7f880d15da
am 553c289a
: am 624220c1
: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:58:12 +00:00
Elliott Hughes
624220c18a
Merge "Remove useless stuff from "AndroidConfig.h"."
2014-06-12 03:32:07 +00:00
Elliott Hughes
e82d33d997
Remove useless stuff from "AndroidConfig.h".
...
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.
Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
Ying Wang
2ebf7c1c5f
am 6b468193
: am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:29:37 +00:00
Ying Wang
4706eb3f22
am c72592b7
: am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'c72592b7bdcfbedd51198b09917a7c331a552544':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:18:28 +00:00
Ying Wang
f1b35fb159
am fd76c34a
: am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'fd76c34a1700d18677a461fb3ae777dd13f813ad':
Allow to opt out both multilib in native test.
2014-06-11 01:09:44 +00:00
Ying Wang
19aa28379f
am 49d9a894
: am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit '49d9a894dcc83ecbc4589d315a9c0799ee6d8846':
Don't rename host libraries if only one arch is build.
2014-06-11 00:27:46 +00:00
Ying Wang
32aff8085a
am 6bfbfee5
: am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit '6bfbfee5358715933fa90cc3ecd8fcf43338315b':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-10 23:32:41 +00:00
Ying Wang
dceddd91d9
am 79b46720
: am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
2014-06-10 22:29:18 +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
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
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
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
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
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
0d27626620
am 128cd1b7
: am 6cc4598d
: Merge "Add global variable HOST_LIBRARY_PATH."
...
* commit '128cd1b7eb66ccb05de417a93d6e432447dc875a':
Add global variable HOST_LIBRARY_PATH.
2014-06-10 20:35:08 +00: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
2d19cbd279
resolved conflicts for merge of 135e11df
to klp-modular-dev-plus-aosp
...
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
2014-06-10 09:45:45 -07: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
b06c655e58
am 322362cf
: am c0275247
: Merge "build native tests for 32-bit and 64-bit"
...
* commit '322362cf01e6d1ed6c73dd27f5a4e162610f55c4':
build native tests for 32-bit and 64-bit
2014-06-09 23:00:02 +00:00
Ying Wang
c02752473f
Merge "build native tests for 32-bit and 64-bit"
2014-06-09 22:53:00 +00:00
Ying Wang
fe9ad0975a
am b1f65358
: am 5ad17493
: Merge "Support .asm being compiled by yasm targeted for x86."
...
* commit 'b1f65358a8af7548dfb02de281b081fc356881b4':
Support .asm being compiled by yasm targeted for x86.
2014-06-09 21:51:01 +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
69d5bd7cbc
am e266873b
: am 1a8f0d3b
: Merge "Move comment out of recipe section"
...
* commit 'e266873b211289ce07420ec2c51208ff83c49c36':
Move comment out of recipe section
2014-06-06 21:30:57 +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
56ec31cfca
am 3fe9a277
: am d0f0918b
: Merge "Reenable ccache."
...
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
Reenable ccache.
2014-06-06 18:40:14 +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
45c3930084
am 3c52ff07
: am e564c0cb
: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
...
* commit '3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
2014-06-04 19:20:29 +00:00
Tim Murray
e564c0cbd0
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
2014-06-04 19:00:38 +00:00
Ying Wang
e8dc18680f
am dc7ff054
: am bc080d51
: am 2a386e0c
: Allow to build the update.zip for emulator build.
...
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
Allow to build the update.zip for emulator build.
2014-06-04 17:30:32 +00:00
Ying Wang
dc7ff05427
am bc080d51
: am 2a386e0c
: Allow to build the update.zip for emulator build.
...
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
Allow to build the update.zip for emulator build.
2014-06-04 17:26:00 +00:00
Ying Wang
bc080d510f
am 2a386e0c
: Allow to build the update.zip for emulator build.
...
* commit '2a386e0cfbdfa009038acede85876a7643f297f5':
Allow to build the update.zip for emulator build.
2014-06-04 17:22:21 +00:00
Ying Wang
2a386e0cfb
Allow to build the update.zip for emulator build.
...
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.
Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-04 17:04:14 +00: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
b641702c08
am 1d6506ca
: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
...
* commit '1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
2014-06-03 13:13:43 +00: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
dfafee3b78
am 7f349dc9
: am 40b7e342
: Merge "Move sdk staging dir to a product-specific dir"
...
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
Move sdk staging dir to a product-specific dir
2014-06-03 01:25:23 +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
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
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
15d49c3b30
am 85e0dce5
: am a8b65126
: Merge "Add -shared to clang LDFLAGS."
...
* commit '85e0dce5f49bfcad97494a674f8a50219914962a':
Add -shared to clang LDFLAGS.
2014-05-30 23:08:50 +00: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
ee7493ccb9
am 329988c2
: am a42e0f50
: Merge "arm64: restore relro/now"
...
* commit '329988c277553621c40bbfff85e9848783992040':
arm64: restore relro/now
2014-05-30 22:59:28 +00:00