OSDN Git Service
Brian Carlstrom [Wed, 30 Jul 2014 16:33:06 +0000 (16:33 +0000)]
am
073dc97c: Merge "Add PROP_NAME_MAX validation"
* commit '
073dc97cf2d8417709f4c77808a4cd6e8f17575e':
Add PROP_NAME_MAX validation
Brian Carlstrom [Wed, 30 Jul 2014 16:30:10 +0000 (16:30 +0000)]
Merge "Add PROP_NAME_MAX validation"
Ying Wang [Wed, 30 Jul 2014 16:17:10 +0000 (16:17 +0000)]
am
7a739f35: Merge "Use hermetic host toolchains."
* commit '
7a739f35857f7c3b7d2de24c56c6eb86bc4818d7':
Use hermetic host toolchains.
Ying Wang [Wed, 30 Jul 2014 16:17:06 +0000 (16:17 +0000)]
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.""
Brian Carlstrom [Tue, 29 Jul 2014 23:08:25 +0000 (16:08 -0700)]
Add PROP_NAME_MAX validation
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
Ying Wang [Wed, 30 Jul 2014 16:14:03 +0000 (16:14 +0000)]
Merge "Use hermetic host toolchains."
Ying Wang [Wed, 30 Jul 2014 16:13:38 +0000 (16:13 +0000)]
Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
Ying Wang [Tue, 29 Jul 2014 21:08:33 +0000 (14:08 -0700)]
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit
a4f84fdfed9a805d69b37de997512cd0616b3ff8.
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
Ying Wang [Tue, 29 Jul 2014 18:01:17 +0000 (18:01 +0000)]
am
ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
* commit '
ecc4267564116197b719baf9ecc24a9f0652fbb5':
Allow LOCAL_ASSET_DIR point to nonexistent dir
Ying Wang [Tue, 29 Jul 2014 17:55:19 +0000 (17:55 +0000)]
Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
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
Ying Wang [Mon, 28 Jul 2014 22:14:51 +0000 (15:14 -0700)]
Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
Marcin Kosiba [Mon, 28 Jul 2014 09:06:07 +0000 (09:06 +0000)]
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."
Ying Wang [Sat, 26 Jul 2014 00:48:25 +0000 (00:48 +0000)]
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.
Yohann Roussel [Fri, 25 Jul 2014 12:53:32 +0000 (12:53 +0000)]
am
970d053c: Merge "Fix doc target for multidex support library."
* commit '
970d053c975e9ee38e61fc00506362a76fcc153d':
Fix doc target for multidex support library.
Tim Murray [Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)]
Tim Murray [Thu, 24 Jul 2014 22:12:14 +0000 (22:12 +0000)]
am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
16d43086e91b76876f195b6d7a7c2e9d021b8293':
Fix Windows SDK build to not use clang.
Tim Murray [Thu, 24 Jul 2014 22:20:58 +0000 (22:20 +0000)]
Merge "fix build"
Tim Murray [Thu, 24 Jul 2014 22:20:18 +0000 (15:20 -0700)]
fix build
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
Tim Murray [Thu, 24 Jul 2014 21:42:53 +0000 (14:42 -0700)]
Fix Windows SDK build to not use clang.
bug
16172793
Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
Tim Murray [Thu, 24 Jul 2014 21:04:24 +0000 (21:04 +0000)]
am
f82de5b8: Merge "Switch host builds to use Clang by default."
* commit '
f82de5b89d70fb0e122f03a3956c5b01e66daca5':
Switch host builds to use Clang by default.
Ying Wang [Thu, 24 Jul 2014 01:45:53 +0000 (01:45 +0000)]
am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
[MIPS64] Enable mips64 clang
Ying Wang [Wed, 23 Jul 2014 23:37:56 +0000 (23:37 +0000)]
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.
Marcin Kosiba [Mon, 28 Jul 2014 09:02:13 +0000 (09:02 +0000)]
Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Dan Albert [Sat, 26 Jul 2014 20:35:06 +0000 (20:35 +0000)]
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
This broke the world.
This reverts commit
3b7a4d811df5b326e714984edd7dd3e2b11e16d5.
Change-Id: Iefb01b8642a92bcc718d2c745e8ce1346ba50143
Yohann Roussel [Fri, 25 Jul 2014 12:44:51 +0000 (12:44 +0000)]
Merge "Fix doc target for multidex support library."
Yohann Roussel [Thu, 24 Jul 2014 15:24:30 +0000 (17:24 +0200)]
Fix doc target for multidex support library.
Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
Tim Murray [Thu, 24 Jul 2014 22:08:41 +0000 (22:08 +0000)]
Merge "Fix Windows SDK build to not use clang."
Ying Wang [Thu, 24 Jul 2014 01:42:13 +0000 (01:42 +0000)]
Merge "[MIPS64] Enable mips64 clang"
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
Tim Murray [Thu, 24 Jul 2014 20:59:29 +0000 (20:59 +0000)]
Merge "Switch host builds to use Clang by default."
Tim Murray [Fri, 4 Apr 2014 21:38:29 +0000 (14:38 -0700)]
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
Ying Wang [Wed, 23 Jul 2014 23:35:05 +0000 (23:35 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
Dehao Chen [Wed, 23 Jul 2014 21:28:58 +0000 (14:28 -0700)]
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Ying Wang [Sat, 26 Jul 2014 00:43:50 +0000 (00:43 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Stephen Hines [Tue, 22 Jul 2014 20:49:15 +0000 (20:49 +0000)]
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.
Stephen Hines [Tue, 22 Jul 2014 20:45:32 +0000 (20:45 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture."
Stephen Hines [Sat, 19 Jul 2014 00:34:14 +0000 (17:34 -0700)]
Default to "prescott" as our baseline i686 host build architecture.
Bug:
16408818
Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
Yohann Roussel [Fri, 18 Jul 2014 14:43:47 +0000 (14:43 +0000)]
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
Yohann Roussel [Fri, 18 Jul 2014 10:55:07 +0000 (10:55 +0000)]
am
d5389ba4: Merge "Move multidex support library"
* commit '
d5389ba4163a1a8506ab91fb287c1167a3de521f':
Move multidex support library
Yohann Roussel [Fri, 18 Jul 2014 10:55:06 +0000 (10:55 +0000)]
am
182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '
182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
Stubs of android-support-multidex-instrumentation.
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '
2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
Generates SDK stubs of android-support-multidex
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
34ba2331: Merge "Support dx generating multiple dex files."
* commit '
34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
Support dx generating multiple dex files.
Yohann Roussel [Fri, 18 Jul 2014 14:40:29 +0000 (14:40 +0000)]
Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:51:19 +0000 (10:51 +0000)]
Merge "Stubs of android-support-multidex-instrumentation."
Yohann Roussel [Fri, 18 Jul 2014 10:51:33 +0000 (10:51 +0000)]
Merge "Move multidex support library"
Yohann Roussel [Fri, 18 Jul 2014 10:51:09 +0000 (10:51 +0000)]
Merge "Generates SDK stubs of android-support-multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:50:56 +0000 (10:50 +0000)]
Merge "Support dx generating multiple dex files."
Ying Wang [Thu, 17 Jul 2014 21:13:55 +0000 (21:13 +0000)]
am
0b30c5f0: Merge "Remove linker64 and debuggerd64"
* commit '
0b30c5f0b5d70ecc7599f33ccd226f62e176872f':
Remove linker64 and debuggerd64
Ying Wang [Thu, 17 Jul 2014 21:07:59 +0000 (21:07 +0000)]
Merge "Remove linker64 and debuggerd64"
Ying Wang [Thu, 17 Jul 2014 20:59:59 +0000 (13:59 -0700)]
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
Yohann Roussel [Thu, 17 Jul 2014 14:52:58 +0000 (16:52 +0200)]
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
Ian Rogers [Thu, 17 Jul 2014 12:30:33 +0000 (12:30 +0000)]
am
bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit '
bc30611f8e08361a41c7e78c799732a7f685e568':
Vary non-image Xmx for dex2oat on MIPS.
Ying Wang [Thu, 17 Jul 2014 12:30:31 +0000 (12:30 +0000)]
am
e1caecfa: Merge "Fix the MIPS build."
* commit '
e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
Fix the MIPS build.
Ian Rogers [Thu, 17 Jul 2014 06:14:28 +0000 (06:14 +0000)]
Merge "Vary non-image Xmx for dex2oat on MIPS."
Ian Rogers [Thu, 17 Jul 2014 05:25:35 +0000 (22:25 -0700)]
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
Ying Wang [Thu, 17 Jul 2014 01:12:36 +0000 (01:12 +0000)]
Merge "Fix the MIPS build."
Ian Rogers [Thu, 17 Jul 2014 01:06:02 +0000 (18:06 -0700)]
Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug:
16221224
Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
Maurice Chu [Wed, 16 Oct 2013 21:30:42 +0000 (14:30 -0700)]
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
Yohann Roussel [Wed, 4 Sep 2013 10:19:46 +0000 (12:19 +0200)]
Stubs of android-support-multidex-instrumentation.
For the SDK.
(cherry picked from commit
584f6019106e5adc87f0f1a3bac75c31efe67f36)
Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
Yohann Roussel [Wed, 21 Aug 2013 12:19:44 +0000 (14:19 +0200)]
Generates SDK stubs of android-support-multidex
(cherry picked from commit
c4441b8c3701147365213a1f789626a8d442db6e)
Conflicts:
core/pathmap.mk
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
Yohann Roussel [Tue, 20 Aug 2013 15:05:27 +0000 (17:05 +0200)]
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
8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b)
Conflicts:
core/java.mk
Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
Ying Wang [Tue, 15 Jul 2014 01:27:42 +0000 (01:27 +0000)]
am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]
Merge "Revert "Fix Java detection on some Linux distributions""
Ying Wang [Tue, 15 Jul 2014 01:22:50 +0000 (01:22 +0000)]
Revert "Fix Java detection on some Linux distributions"
This reverts commit
09040dd8232f8fe588d938e04581ba1648f452f4.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
Ying Wang [Mon, 14 Jul 2014 21:40:49 +0000 (21:40 +0000)]
am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
c7f1389d2683be9068d22666b484e48abcff12f1':
Fix Java detection on some Linux distributions
Stephen Hines [Mon, 14 Jul 2014 20:29:47 +0000 (20:29 +0000)]
am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
60a0ba2b345720313d1beb0421db57ece75c063c':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:29:46 +0000 (20:29 +0000)]
am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
fd5e704c5683077e4c689d4a27769c034b48be7f':
Add bcc into /system/bin.
Ying Wang [Mon, 14 Jul 2014 21:36:53 +0000 (21:36 +0000)]
Merge "Fix Java detection on some Linux distributions"
Stephen Hines [Mon, 14 Jul 2014 20:27:53 +0000 (20:27 +0000)]
Merge "Add bcc into /system/bin."
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
Stephen Hines [Mon, 14 Jul 2014 20:28:27 +0000 (20:28 +0000)]
Merge "Remove bcc from generic_no_telephony.mk."
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
Bernhard Rosenkränzer [Mon, 14 Jul 2014 08:42:11 +0000 (10:42 +0200)]
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>
Nick Kralevich [Fri, 11 Jul 2014 01:56:46 +0000 (01:56 +0000)]
am
6ff84956: Merge "Fix PIC default to be -fPIC"
* commit '
6ff849568c94c53c8a722f71f33c1e688ebbed74':
Fix PIC default to be -fPIC
Colin Cross [Thu, 10 Jul 2014 06:33:08 +0000 (06:33 +0000)]
am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
ec5563b55146372fe33ebd4fc13661d811b77323':
build: fix host dex2oat runtime args
Nick Kralevich [Thu, 10 Jul 2014 17:27:20 +0000 (17:27 +0000)]
Merge "Fix PIC default to be -fPIC"
Ying Wang [Thu, 10 Jul 2014 00:08:18 +0000 (00:08 +0000)]
am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
c4954f392e94f1877ab77ccef725a26c5d549ed1':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Ying Wang [Thu, 10 Jul 2014 00:08:13 +0000 (00:08 +0000)]
am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
Allow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Wed, 9 Jul 2014 23:18:08 +0000 (23:18 +0000)]
Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"
Ying Wang [Wed, 9 Jul 2014 22:40:33 +0000 (22:40 +0000)]
Merge "Allow symlinks to device or vendor tree in envsetup.sh."
Ying Wang [Wed, 9 Jul 2014 22:37:34 +0000 (15:37 -0700)]
Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
Ying Wang [Wed, 9 Jul 2014 17:57:32 +0000 (10:57 -0700)]
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug:
15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
Colin Cross [Thu, 10 Jul 2014 06:10:50 +0000 (06:10 +0000)]
Merge "build: fix host dex2oat runtime args"
Colin Cross [Thu, 10 Jul 2014 05:09:50 +0000 (22:09 -0700)]
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
Brian Carlstrom [Wed, 9 Jul 2014 12:21:56 +0000 (12:21 +0000)]
am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 12:21:48 +0000 (12:21 +0000)]
am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
bc7501e10324caf1318769901d8a382d46be0b60':
More consistent use of 64-bit build variable.
Brian Carlstrom [Wed, 9 Jul 2014 04:07:43 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [build]"
Ying Wang [Wed, 9 Jul 2014 01:06:23 +0000 (01:06 +0000)]
Merge "More consistent use of 64-bit build variable."
Ying Wang [Wed, 9 Jul 2014 00:07:36 +0000 (17:07 -0700)]
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
Elliott Hughes [Tue, 8 Jul 2014 20:12:20 +0000 (20:12 +0000)]
am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
af95db033de4808826fde12772a6d33a72dda608':
ADBS now uses stack_core code to parse traces.
Dan Albert [Tue, 8 Jul 2014 18:51:44 +0000 (18:51 +0000)]
am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
Remove -Bsymbolic from builds.
Brian Carlstrom [Tue, 8 Jul 2014 17:35:29 +0000 (10:35 -0700)]
Make dex2oat heap size product configurable [build]
Bug:
15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
Dan Albert [Tue, 8 Jul 2014 18:47:16 +0000 (18:47 +0000)]
Merge "Remove -Bsymbolic from builds."
Ying Wang [Tue, 8 Jul 2014 00:43:42 +0000 (00:43 +0000)]
am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
979d578ee40c0a7d3e25915049350a23165f7a5a':
Fix host java doc by referring to the correct classpath.
Ying Wang [Tue, 8 Jul 2014 00:22:13 +0000 (00:22 +0000)]
am
d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '
d2aa51b8aee454baf96d8ac6d1997dd9450ae974':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Elliott Hughes [Tue, 8 Jul 2014 20:06:09 +0000 (20:06 +0000)]
Merge "ADBS now uses stack_core code to parse traces."
Brigid Smith [Tue, 1 Jul 2014 00:21:27 +0000 (17:21 -0700)]
ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
Ying Wang [Tue, 8 Jul 2014 00:39:35 +0000 (00:39 +0000)]
Merge "Fix host java doc by referring to the correct classpath."
Ying Wang [Mon, 7 Jul 2014 23:43:49 +0000 (16:43 -0700)]
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