Commit Graph

15931 Commits

Author SHA1 Message Date
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 717bc3a3b7 Merge "Don't fail the build for dangling module names." 2014-07-25 21:16:27 +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
Ying Wang bb164eb640 Merge "Fix 64 bit emulator booting (again)." 2014-07-25 21:16:27 +00:00
Narayan Kamath 97eae625a0 Fix 64 bit emulator booting (again).
Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.

Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
2014-07-30 09:35:41 -07:00
Narayan Kamath 0ad0d197c3 SDK targets should inherit from core_64_bit.mk
bug: 15661143

(cherry picked from commit e78ba32d23)

Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
2014-07-30 09:35:08 -07:00
Ying Wang be7449b0e1 Add SDK product for arm64, x86_64 and mips64.
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-07-30 09:33:46 -07:00
Ying Wang 3381a52556 Remove the unused large_emu_hw.mk
Change-Id: Iea8330e00983f4eac44d8a072c1bf185afcf6a80

Conflicts:
	target/product/large_emu_hw.mk
2014-07-30 09:33:28 -07:00
Ying Wang 4b323c6256 Merge "SDK targets should inherit from core_64_bit.mk" 2014-07-30 16:17:48 +00:00
Ying Wang 7a739f3585 Merge "Use hermetic host toolchains." 2014-07-29 21:36:05 +00:00
Ying Wang b0da8265b2 Merge "Add SDK product for arm64, x86_64 and mips64." 2014-07-29 21:36:05 +00:00
Ying Wang aea1cae4f5 Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""" 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 ecc4267564 Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir" 2014-07-29 17:36:25 +00: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
Ying Wang 8f509bad6d Merge "Remove the unused large_emu_hw.mk" 2014-07-25 21:16:27 +00:00
Brian Carlstrom 073dc97cf2 Merge "Add PROP_NAME_MAX validation" 2014-07-30 16:17:48 +00:00
Brian Carlstrom dad2ab4df4 Add PROP_NAME_MAX validation
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
2014-07-29 16:13:18 -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
Ying Wang 45040bdbb8 Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang." 2014-07-23 18:04:01 +00:00
Yohann Roussel 970d053c97 Merge "Fix doc target for multidex support library." 2014-07-23 19:30:00 +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
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
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 1029013a0d Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 2014-07-17 22:39:21 +00:00
Yohann Roussel d5389ba416 Merge "Move multidex support library" 2014-07-17 22:36:58 +00:00
Yohann Roussel 182ac4e3fd Merge "Stubs of android-support-multidex-instrumentation." 2014-07-17 22:37:43 +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 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 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