Commit Graph

15764 Commits

Author SHA1 Message Date
Ying Wang 135e11df38 am c3838620: Merge "Switch to 32-bit-by-default host multilib build."
* commit 'c383862020034b3db4e365aaf501a84a35e85ffe':
  Switch to 32-bit-by-default host multilib build.
2014-06-10 16:31:39 +00: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 322362cf01 am c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit 'c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
  build native tests for 32-bit and 64-bit
2014-06-09 22:57:48 +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 b1f65358a8 am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '5ad17493cdb329087459ef7cddaed20cb1bba707':
  Support .asm being compiled by yasm targeted for x86.
2014-06-09 21:47:40 +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 e266873b21 am 1a8f0d3b: Merge "Move comment out of recipe section"
* commit '1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
  Move comment out of recipe section
2014-06-06 21:17:40 +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 3fe9a277fe am d0f0918b: Merge "Reenable ccache."
* commit 'd0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
  Reenable ccache.
2014-06-06 18:24:31 +00: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 3c52ff0714 am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit 'e564c0cbd08c728d84e62308c741b30f3bd542f8':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
2014-06-04 19:05:45 +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
Qiwen Zhao d6e6f97a8e am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit 'e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
  Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
2014-06-04 18:27:18 +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 5de36c46d8 am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit 'a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
  Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
2014-06-04 17:12:13 +00: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 c653faa887 am 37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '37773821f150778c48ef3519407d8ee71dd66a30':
  DO NOT MERGE: Combine emulator test projects into a single apk
2014-06-04 16:55:53 +00:00
Steve Moyer 1e1681db51 am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '008dc16cb06976620c0fa1e51942f2d1c6af54f3':
  DO NOT MERGE: Combine emulator test projects into a single apk
2014-06-04 16:55:52 +00: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