Commit graph

15903 commits

Author SHA1 Message Date
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
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
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
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
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
Ying Wang
15d0066488 Merge "Revert "Fix Java detection on some Linux distributions"" 2014-07-15 00:42:07 +00:00
Ying Wang
d28feb0066 Revert "Fix Java detection on some Linux distributions"
This reverts commit 09040dd823.

Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
2014-07-15 01:22:50 +00:00
Ying Wang
c7f1389d26 Merge "Fix Java detection on some Linux distributions" 2014-07-14 17:15:23 +00:00
Stephen Hines
60a0ba2b34 Merge "Remove bcc from generic_no_telephony.mk." 2014-07-14 16:03:19 +00:00
leozwang
176b0d3f86 Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.

Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
2014-07-14 10:28:38 -07:00
Stephen Hines
fd5e704c56 Merge "Add bcc into /system/bin." 2014-07-14 16:08:11 +00:00
leozwang
01e6853556 Add bcc into /system/bin.
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
2014-07-14 13:27:02 -07:00
Bernhard Rosenkränzer
09040dd823 Fix Java detection on some Linux distributions
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.

Given "../../etc/alternatives/javac" is a relative, symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no
../../etc/alternatives/java relative to the build directory), causing
tools.jar not to be found.

Using readlink -f should work in all cases (while also simplifying the
script a bit).

Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-07-14 10:54:58 +02:00
Nick Kralevich
6ff849568c Merge "Fix PIC default to be -fPIC" 2014-07-10 00:35:03 +00:00
Colin Cross
ec5563b551 Merge "build: fix host dex2oat runtime args" 2014-07-09 14:42:04 +00:00
Colin Cross
dd2ff5541e build: fix host dex2oat runtime args
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
2014-07-09 22:22:10 -07:00
Ying Wang
c4954f392e Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img" 2014-07-09 21:46:48 +00:00
Ying Wang
c35cc93d3b Merge "Allow symlinks to device or vendor tree in envsetup.sh." 2014-07-09 21:35:35 +00:00
Ying Wang
506410a549 Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
2014-07-09 15:37:34 -07:00
Ying Wang
edfd55ae99 Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
2014-07-09 10:57:32 -07:00
Brian Carlstrom
02a5b51798 Merge "Make dex2oat heap size product configurable [build]" 2014-07-08 22:56:31 +00:00
Ying Wang
bc7501e103 Merge "More consistent use of 64-bit build variable." 2014-07-08 22:56:31 +00:00
Ying Wang
4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Brian Carlstrom
cffe289dc6 Make dex2oat heap size product configurable [build]
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Elliott Hughes
af95db033d Merge "ADBS now uses stack_core code to parse traces." 2014-07-07 18:07:41 +00:00
Dan Albert
3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Brigid Smith
90c66cff3a ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang
979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang
ad7809bba4 Fix host java doc by referring to the correct classpath.
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
2014-07-07 16:50:39 -07:00
Ying Wang
d2aa51b8ae Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX." 2014-07-02 20:49:53 +00:00