Commit graph

4237 commits

Author SHA1 Message Date
Brian Carlstrom
557e7e5413 am ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit 'ce06199a047f81d6afe522ab4e6f489deecb46f3':
  Make system use patchoat to relocate during runtime.
2014-08-05 17:51:10 +00:00
Alex Light
ce090d3f45 Make system use patchoat to relocate during runtime.
Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:09 -07:00
Brian Carlstrom
9b80095e6c am 430ec575: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"
* commit '430ec575cd40672aab8394c31c7e45294ee302e5':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
2014-08-04 18:33:00 +00:00
Brian Carlstrom
430ec575cd Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]" 2014-08-01 01:50:59 +00:00
Ying Wang
e0383397a2 am e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit 'e1a77930448a93b52e6b4dbbd9aca5ad861844d4':
  Update host linux toolchain to gcc 4.8
2014-07-31 18:00:25 +00:00
Elliott Hughes
c378352de8 am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'd23798bfdc9bb34909177c3c5f06f0c97cc9897e':
  [MIPSR6] Add mips64r6 and mips32r6 targets
2014-07-30 23:25:19 +00:00
Elliott Hughes
e4d54f317d am 0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '0b3c42cbc848726d83cea953a41c333856182cf9':
  [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
2014-07-30 23:25:19 +00:00
Brian Carlstrom
4d30e5e260 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
2014-07-30 15:57:16 -07:00
Ying Wang
eac74b2457 am 717bc3a3: Merge "Don\'t fail the build for dangling module names."
* commit '717bc3a3b7ea2d8835523d01ba020332fb76ac5a':
  Don't fail the build for dangling module names.
2014-07-30 17:26:00 +00:00
Ying Wang
3f19161748 am 7a739f35: Merge "Use hermetic host toolchains."
* commit '7a739f35857f7c3b7d2de24c56c6eb86bc4818d7':
  Use hermetic host toolchains.
2014-07-30 16:17:10 +00:00
Ying Wang
18c20aae44 am aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit 'aea1cae4f5a3fcc5e6ecdca24409f102469b411b':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
2014-07-30 16:17:06 +00:00
Elliott Hughes
d23798bfdc Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" 2014-07-30 11:26:00 +00:00
Ying Wang
7a739f3585 Merge "Use hermetic host toolchains." 2014-07-29 21:36:05 +00:00
Ying Wang
1b0fc43557 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
2014-07-29 18:05:27 -07:00
Ying Wang
9929fd661c am ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
* commit 'ecc4267564116197b719baf9ecc24a9f0652fbb5':
  Allow LOCAL_ASSET_DIR point to nonexistent dir
2014-07-29 18:01:17 +00:00
David 'Digit' Turner
44ee3419e7 Update host linux toolchain to gcc 4.8
This patch ensures the build system uses the prebuilt gcc-4.8 toolchain
when building host Linux binaries, instead of the gcc-4.6 one.

Change-Id: I7b449650714ba4314a780827e0243f2af40ec82c
2014-07-31 19:51:40 +02:00
Ying Wang
bfcdf060ba Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.

Change-Id: Id53433c0d3a4c7af601283755199fde6a59cdfaf
2014-07-29 10:34:30 -07:00
Ying Wang
5e2ebcbe26 Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
2014-07-28 15:14:51 -07:00
Marcin Kosiba
bf4ac764cd am 6be7d2e5: Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '6be7d2e5bb9da9b1b5c06886466d089637529dcc':
  Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
2014-07-28 09:06:07 +00:00
Ying Wang
53e19fd4e2 am 45040bdb: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
* commit '45040bdbb8c3a543746538b1e08b5ac53c427099':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.
2014-07-26 00:48:25 +00:00
Ying Wang
495630f653 Don't fail the build for dangling module names.
Change-Id: I939253552e7ca6a672f662ae6be3eac41f5bab41
2014-07-30 10:20:56 -07:00
Yohann Roussel
4e0693cf6c am 970d053c: Merge "Fix doc target for multidex support library."
* commit '970d053c975e9ee38e61fc00506362a76fcc153d':
  Fix doc target for multidex support library.
2014-07-25 12:53:32 +00:00
Tim Murray
d161be2d06 am 77d93bce: Merge "fix build"
* commit '77d93bceb06dd3983868327b03a726bf5d8ae079':
  fix build
2014-07-24 22:25:59 +00:00
Tim Murray
eb9563f9ab am 16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '16d43086e91b76876f195b6d7a7c2e9d021b8293':
  Fix Windows SDK build to not use clang.
2014-07-24 22:12:14 +00:00
Tim Murray
f3ca3d560a fix build
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
2014-07-24 15:20:18 -07:00
Tim Murray
5ca1dc15a1 Fix Windows SDK build to not use clang.
bug 16172793

Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
2014-07-24 14:43:33 -07:00
Tim Murray
2812b27c5f am f82de5b8: Merge "Switch host builds to use Clang by default."
* commit 'f82de5b89d70fb0e122f03a3956c5b01e66daca5':
  Switch host builds to use Clang by default.
2014-07-24 21:04:24 +00:00
Duane Sand
6bab974cdc [MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.

Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.

Change-Id: I1740a6c658304b6c41242be58d68753e6f171658
2014-07-24 11:19:21 -07:00
Ying Wang
5d23800f2b am 1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
  [MIPS64] Enable mips64 clang
2014-07-24 01:45:53 +00:00
Ying Wang
ebe0bacc80 am 6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '6837ac67035518f5c36c91ae07ec95010c7071bd':
  Refactor FDO support code to ensure arm64 can also be built with FDO.
2014-07-23 23:37:56 +00:00
Duane Sand
6670e24aed [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32
2014-07-23 14:16:00 -07:00
Duane Sand
41ca444637 [MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
2014-07-23 14:10:39 -07:00
Marcin Kosiba
6be7d2e5bb Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."" 2014-07-23 19:31:58 +00:00
Dan Albert
a4f84fdfed Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
This broke the world.

This reverts commit 3b7a4d811d.

Change-Id: Iefb01b8642a92bcc718d2c745e8ce1346ba50143
2014-07-26 20:35:06 +00:00
Yohann Roussel
970d053c97 Merge "Fix doc target for multidex support library." 2014-07-23 19:30:00 +00:00
Yohann Roussel
5679e356d2 Fix doc target for multidex support library.
Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
2014-07-24 17:24:30 +02:00
Ying Wang
1bb9adb880 Merge "[MIPS64] Enable mips64 clang" 2014-07-23 18:51:55 +00:00
Tim Murray
92d79cbb41 Switch host builds to use Clang by default.
If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc.

This also enables the integrated assembler by default for Darwin host builds.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-24 09:25:58 -07:00
Dehao Chen
7092c79a14 Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:34:07 -07:00
Ying Wang
45040bdbb8 Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang." 2014-07-23 18:04:01 +00:00
Elliott Hughes
0b3c42cbc8 Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" 2014-07-23 17:53:27 +00:00
Stephen Hines
786c565ea4 am 38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '38470c3fffd25a300045d62cccc8ab129cb71349':
  Default to "prescott" as our baseline i686 host build architecture.
2014-07-22 20:49:15 +00:00
Stephen Hines
38470c3fff Merge "Default to "prescott" as our baseline i686 host build architecture." 2014-07-22 16:25:43 +00:00
Stephen Hines
1b50a12a81 Default to "prescott" as our baseline i686 host build architecture.
Bug: 16408818

Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
2014-07-18 17:34:43 -07:00
Yohann Roussel
d825997d87 am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
* commit '1029013a0db29b926da93d2400b181d1c3b495fe':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
2014-07-18 14:43:47 +00:00
Yohann Roussel
60c0454d1d am d5389ba4: Merge "Move multidex support library"
* commit 'd5389ba4163a1a8506ab91fb287c1167a3de521f':
  Move multidex support library
2014-07-18 10:55:07 +00:00
Yohann Roussel
368a6f44a9 am 182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
  Stubs of android-support-multidex-instrumentation.
2014-07-18 10:55:06 +00:00
Yohann Roussel
189f95221c am 2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
  Generates SDK stubs of android-support-multidex
2014-07-18 10:55:05 +00:00
Yohann Roussel
9b457ea066 am 34ba2331: Merge "Support dx generating multiple dex files."
* commit '34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
  Support dx generating multiple dex files.
2014-07-18 10:55:05 +00:00
Yohann Roussel
1029013a0d Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 2014-07-17 22:39:21 +00:00