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
Dave Allison
f4115cdfac
am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit '2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
2014-05-29 19:57:50 +00:00
Dave Allison
2a2ba735df
Merge "Add libsigchain to the embedded.mk makefile"
2014-05-29 19:51:50 +00:00
Brian Carlstrom
ab6f84e3d1
am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
...
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 19:40:02 +00:00
Brian Carlstrom
2267c22b3d
am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:49 +00:00
Brian Carlstrom
e0df9d9577
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
2014-05-29 19:36:38 +00:00
Brian Carlstrom
f2a2406b8c
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
2014-05-29 19:36:35 +00:00
Andrew Hsieh
4c952d72b7
Add -latomic to all target builds
...
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.
Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.
Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
2014-05-29 11:40:46 -07:00
Brian Carlstrom
3f5ff08dc5
Only enable WITH_DEXPREOPT by default for libdvm.so
...
Bug: 14298175
(cherry picked from commit 9f8e214a91
)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
2014-05-29 09:38:04 -07:00
Brian Carlstrom
1e60fe58f0
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit bf8a374a92
)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
2014-05-29 09:37:25 -07:00
Ying Wang
d3ddfdf847
am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
...
* commit 'b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
2014-05-28 23:38:46 +00:00
Ying Wang
b3bed5952b
Merge "Add a dummy build recipe for generated RS cpp files."
2014-05-28 23:33:35 +00:00
Ying Wang
d40776aa88
am 65afd710: Merge "Add a dummy build recipe for the proto generated header files"
...
* commit '65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
2014-05-28 23:28:58 +00:00
Ying Wang
65afd710a5
Merge "Add a dummy build recipe for the proto generated header files"
2014-05-28 23:26:01 +00:00
Ying Wang
81ab8339fe
Add a dummy build recipe for generated RS cpp files.
...
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug: 15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
2014-05-28 16:17:09 -07:00
Ying Wang
5186dac02b
Add a dummy build recipe for the proto generated header files
...
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug: 13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
2014-05-28 16:15:13 -07:00
Brian Carlstrom
ed97938caa
am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:44 +00:00
Brian Carlstrom
7df64f7c0d
Merge "Move to dalvik.vm.lib.2 to force default to libart"
2014-05-28 22:28:35 +00:00
Brian Carlstrom
31f5db27c6
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit 7e127ebe0b
)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
2014-05-28 14:49:34 -07:00