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
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
77d93bceb0
Merge "fix build"
2014-07-24 22:07:52 +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
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
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
Tim Murray
16d43086e9
Merge "Fix Windows SDK build to not use clang."
2014-07-23 18:56:15 +00:00
Ying Wang
1bb9adb880
Merge "[MIPS64] Enable mips64 clang"
2014-07-23 18:51:55 +00:00
Duane Sand
41ca444637
[MIPS64] Enable mips64 clang
...
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
2014-07-23 14:10:39 -07:00
Tim Murray
f82de5b89d
Merge "Switch host builds to use Clang by default."
2014-07-23 18:45:08 +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
Ying Wang
6837ac6703
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
2014-07-23 18:45:08 +00: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
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
Yohann Roussel
182ac4e3fd
Merge "Stubs of android-support-multidex-instrumentation."
2014-07-17 22:37:43 +00:00
Yohann Roussel
d5389ba416
Merge "Move multidex support library"
2014-07-17 22:36:58 +00:00
Yohann Roussel
2d3e4d22d9
Merge "Generates SDK stubs of android-support-multidex"
2014-07-17 22:36:58 +00:00
Yohann Roussel
34ba2331f7
Merge "Support dx generating multiple dex files."
2014-07-17 22:36:58 +00:00
Ying Wang
ef44fb2d7b
am 0b30c5f0: Merge "Remove linker64 and debuggerd64"
...
* commit '0b30c5f0b5d70ecc7599f33ccd226f62e176872f':
Remove linker64 and debuggerd64
2014-07-17 21:13:55 +00:00
Ying Wang
0b30c5f0b5
Merge "Remove linker64 and debuggerd64"
2014-07-17 18:15:27 +00:00
Ying Wang
b2be5ffded
Remove linker64 and debuggerd64
...
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.
Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
2014-07-17 14:01:12 -07:00
Yohann Roussel
100aba5374
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
...
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.
Change-Id: Icd6903a43c90efc08eba92976dddb104c45a5e43
2014-07-17 17:20:03 +02:00
Ian Rogers
fab98ef6d4
am bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
...
* commit 'bc30611f8e08361a41c7e78c799732a7f685e568':
Vary non-image Xmx for dex2oat on MIPS.
2014-07-17 12:30:33 +00:00
Ying Wang
7d50394bd7
am e1caecfa: Merge "Fix the MIPS build."
...
* commit 'e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
Fix the MIPS build.
2014-07-17 12:30:31 +00:00
Ian Rogers
bc30611f8e
Merge "Vary non-image Xmx for dex2oat on MIPS."
2014-07-16 23:43:15 +00:00
Ian Rogers
87f0d006f2
Vary non-image Xmx for dex2oat on MIPS.
...
The image Xmx is already fixed at 64m. The issue is in the non boot image case.
Change-Id: Idd508187ce8ac3d3c8dbe357c74bc33a5c8185dd
2014-07-16 22:25:35 -07:00
Ying Wang
e1caecfaa2
Merge "Fix the MIPS build."
2014-07-16 23:31:38 +00:00
Ian Rogers
7d70f830bc
Fix the MIPS build.
...
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224
Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
2014-07-16 18:06:02 -07:00
Maurice Chu
4cb1d0956d
Move multidex support library
...
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.
GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).
Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
2014-07-16 19:39:11 +02:00
Yohann Roussel
06fe5d1aef
Stubs of android-support-multidex-instrumentation.
...
For the SDK.
(cherry picked from commit 584f601910
)
Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
2014-07-16 12:45:13 +02:00
Yohann Roussel
10713dcece
Generates SDK stubs of android-support-multidex
...
(cherry picked from commit c4441b8c37
)
Conflicts:
core/pathmap.mk
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
2014-07-16 12:43:36 +02:00
Yohann Roussel
e019dfd721
Support dx generating multiple dex files.
...
Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.
(cherry picked from commit 8ffe9c3e79
)
Conflicts:
core/java.mk
Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
2014-07-16 12:38:22 +02:00