OSDN Git Service
Ben Cheng [Wed, 16 Apr 2014 17:05:58 +0000 (17:05 +0000)]
am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
d32bbe7d060ac92c062a6d57c747ffc319aa5f86':
Explicitly link libstdc++.a for static gtest executables.
Ben Cheng [Wed, 16 Apr 2014 17:03:21 +0000 (17:03 +0000)]
Merge "Explicitly link libstdc++.a for static gtest executables."
Ben Cheng [Tue, 15 Apr 2014 21:52:16 +0000 (14:52 -0700)]
Explicitly link libstdc++.a for static gtest executables.
Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
Ying Wang [Tue, 15 Apr 2014 23:34:34 +0000 (23:34 +0000)]
am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:32:42 +0000 (23:32 +0000)]
Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
Ying Wang [Tue, 15 Apr 2014 21:42:27 +0000 (14:42 -0700)]
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Bug:
11368415
Bug:
14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
Andrew Hsieh [Tue, 15 Apr 2014 21:41:08 +0000 (21:41 +0000)]
am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
695d8f69561b8162abe8611d1f6796b6a91ca1ac':
Add -Wl,-maarch64linux
Andrew Hsieh [Tue, 15 Apr 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Add -Wl,-maarch64linux"
Andrew Hsieh [Tue, 15 Apr 2014 18:54:06 +0000 (11:54 -0700)]
Add -Wl,-maarch64linux
The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with
backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/
The existing ld.bfd is fine because it's configured to support
aarch64linux only. ld.mcld (see https://android-review.googlesource.com/#/c/91047)
needs explicit emulation switch because it supports multiple targets
Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
Narayan Kamath [Tue, 15 Apr 2014 11:02:48 +0000 (11:02 +0000)]
am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
22261a3f9b50dfb567ca072ec7ca2c77fd64e531':
"desktop" linux has Posix clocks.
Narayan Kamath [Tue, 15 Apr 2014 10:58:51 +0000 (10:58 +0000)]
Merge ""desktop" linux has Posix clocks."
Colin Cross [Sat, 12 Apr 2014 00:08:19 +0000 (00:08 +0000)]
am
5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '
5b1fa1c8a05618a2c47edc628b2bafe4a9c6c50a':
build: remove LOCAL_NO_2ND_ARCH
Colin Cross [Sat, 12 Apr 2014 00:06:30 +0000 (00:06 +0000)]
Merge "build: remove LOCAL_NO_2ND_ARCH"
Colin Cross [Fri, 11 Apr 2014 23:00:23 +0000 (16:00 -0700)]
build: remove LOCAL_NO_2ND_ARCH
Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent
functionality is available with LOCAL_MULTILIB := first.
Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
Ben Cheng [Fri, 11 Apr 2014 23:41:28 +0000 (23:41 +0000)]
am
065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit '
065c41809f8db0151a1f5c2751f1f58846d58988':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Ben Cheng [Fri, 11 Apr 2014 23:37:44 +0000 (23:37 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
Ben Cheng [Fri, 11 Apr 2014 23:36:25 +0000 (23:36 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This reverts commit
1ae9b213eb5648205223e4b825f4c808a5d2ace8.
Sigh... new warnings found by 4.9 break checkbuild.
Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
Ben Cheng [Fri, 11 Apr 2014 22:38:37 +0000 (22:38 +0000)]
am
f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit '
f702d6d1d534c914bc0127937eb1a1df61c60762':
Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
Ben Cheng [Fri, 11 Apr 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Ben Cheng [Fri, 11 Apr 2014 19:22:56 +0000 (12:22 -0700)]
Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.
Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
Ben Cheng [Fri, 11 Apr 2014 17:05:32 +0000 (17:05 +0000)]
am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
eec11d9727ab0e6bc843f059d5f2921ada2e8e9a':
Decouple platform compiler and NDK library versioning.
Ben Cheng [Fri, 11 Apr 2014 17:02:32 +0000 (17:02 +0000)]
Merge "Decouple platform compiler and NDK library versioning."
Colin Cross [Fri, 11 Apr 2014 07:17:10 +0000 (07:17 +0000)]
am
a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* commit '
a355ae12506150a7a676956f3c5083f852ba5722':
build: remove packages/ from 64-bit blacklist
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
build: add support for LOCAL_MULTILIB := 64
build: fix TARGET_PREFER_32_BIT
Colin Cross [Fri, 11 Apr 2014 05:50:10 +0000 (05:50 +0000)]
Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* changes:
build: remove packages/ from 64-bit blacklist
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
build: add support for LOCAL_MULTILIB := 64
build: fix TARGET_PREFER_32_BIT
Ben Cheng [Fri, 11 Apr 2014 05:46:26 +0000 (22:46 -0700)]
Decouple platform compiler and NDK library versioning.
TARGET_GCC_VERSION: select compiler from prebuilts/gcc/...
TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/...
Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
Colin Cross [Thu, 10 Apr 2014 18:31:13 +0000 (11:31 -0700)]
build: remove packages/ from 64-bit blacklist
Everything under packages/ will build for 64-bit now, and
package.mk has been updated to not produce 64-bit libraries
on devices that don't support them (all of them right now).
Change-Id: I2c10e41f727cfc8fe237819308a6dfa34c4fff3f
Colin Cross [Thu, 10 Apr 2014 18:29:05 +0000 (11:29 -0700)]
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
Use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS to
determine which native libraries to build for an app. If
both are set, it will use 64-bit unless TARGET_PREFER_32_BIT is set.
If only one is set, it will only build apps that work on that
architecture. If neither is set it will fall back to only building
32-bit apps.
On existing 32-bit devices neither variable will be set, and the
build system will continue to build 32-bit apps.
Once a device has support for a 64-bit runtime, the same logic
that selects the dual runtimes should set TARGET_SUPPORTS_32_BIT_APPS
and TARGET_SUPPORTS_64_BIT_APPS, and packages will be built for
the preferred arch, or fall back to the non-preferrred arch if
necessary.
For testing, a device may set TARGET_SUPPORTS_64_BIT_APPS without
TARGET_SUPPORTS_32_BIT_APPS to produce only 64-bit apps.
Change-Id: I5b5e23f15602c3cf9bd96791971208a85492c7a3
Colin Cross [Thu, 10 Apr 2014 18:28:04 +0000 (11:28 -0700)]
build: add support for LOCAL_MULTILIB := 64
I don't expect it to be useful for modules, but package.mk will
use it to only install 64-bit native apps on devices that
only have a 64-bit zygote.
Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
Colin Cross [Thu, 10 Apr 2014 19:28:56 +0000 (12:28 -0700)]
build: fix TARGET_PREFER_32_BIT
TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed,
it needs to try the 32-bit rule first, then fall back to the 64-bit
rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build.
Also port TARGET_PREFER_32_BIT to package.mk.
Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
Colin Cross [Thu, 10 Apr 2014 20:17:09 +0000 (20:17 +0000)]
am
80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit '
80f7dbd4deb0a765eaf4a697ea3bcc2e5f2c5b3b':
gdbclient: use 64-bit suffix for all library symbols
Colin Cross [Thu, 10 Apr 2014 20:15:21 +0000 (20:15 +0000)]
Merge "gdbclient: use 64-bit suffix for all library symbols"
Colin Cross [Thu, 10 Apr 2014 19:51:39 +0000 (12:51 -0700)]
gdbclient: use 64-bit suffix for all library symbols
Correct the solib-search-path for 64-bit to look in /system/lib64
for all libraries including those in subdirectories.
Change-Id: I606a0eae1137a857564facc79306ad83097d9659
Ben Cheng [Thu, 10 Apr 2014 17:18:26 +0000 (17:18 +0000)]
am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
13eaf184f6e5c803f52f5003ace36bafe64671c9':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:14:57 +0000 (17:14 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
Ben Cheng [Thu, 10 Apr 2014 17:14:01 +0000 (17:14 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build."
This reverts commit
6154690d8615995b961530479ddc1a34946efe49.
Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
Narayan Kamath [Thu, 10 Apr 2014 16:36:53 +0000 (17:36 +0100)]
"desktop" linux has Posix clocks.
Change-Id: I90885a2bbb65f14f774ae72b2ca6738176bf0341
Ben Cheng [Thu, 10 Apr 2014 16:36:06 +0000 (16:36 +0000)]
am
d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '
d957d6bbdb29fccae74f3511251cae22376550af':
Use aarch64-linux-android-4.9 for arm64 build.
Ben Cheng [Thu, 10 Apr 2014 16:33:51 +0000 (16:33 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Wed, 9 Apr 2014 22:56:47 +0000 (15:56 -0700)]
Use aarch64-linux-android-4.9 for arm64 build.
Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
Ying Wang [Wed, 9 Apr 2014 21:32:16 +0000 (21:32 +0000)]
am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
1a4676a17c5483c04f347a4e58890640a71c8368':
Increase the maximum javac heap size again.
Ying Wang [Wed, 9 Apr 2014 21:29:19 +0000 (21:29 +0000)]
Merge "Increase the maximum javac heap size again."
Ying Wang [Wed, 9 Apr 2014 21:27:29 +0000 (14:27 -0700)]
Increase the maximum javac heap size again.
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
Narayan Kamath [Wed, 9 Apr 2014 16:11:01 +0000 (16:11 +0000)]
am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
94147a919b1148d8a128a99b33f3c938d87452c7':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Narayan Kamath [Wed, 9 Apr 2014 16:08:30 +0000 (16:08 +0000)]
Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
Narayan Kamath [Mon, 3 Mar 2014 19:31:10 +0000 (19:31 +0000)]
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
We no longer provide this function in bionic. All callers
should be moved over to pthread_condattr_setclock().
Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
Narayan Kamath [Wed, 9 Apr 2014 08:50:28 +0000 (08:50 +0000)]
am
cf61a7a0: Merge "Add 32 / 64 bit abi lists to system properties."
* commit '
cf61a7a0db4361689f0ee583fbbe7b3a0519a538':
Add 32 / 64 bit abi lists to system properties.
Narayan Kamath [Wed, 9 Apr 2014 08:48:03 +0000 (08:48 +0000)]
Merge "Add 32 / 64 bit abi lists to system properties."
Narayan Kamath [Mon, 7 Apr 2014 10:01:54 +0000 (11:01 +0100)]
Add 32 / 64 bit abi lists to system properties.
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.
This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.
bug:
13647418
Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
Ying Wang [Mon, 7 Apr 2014 22:42:57 +0000 (22:42 +0000)]
am
bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
* commit '
bdac8cf148bab0e0ff9d8d51ab202ccb3adfcae8':
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
Ying Wang [Mon, 7 Apr 2014 22:42:57 +0000 (22:42 +0000)]
am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
1b08226afa693646facbd718be2b4a657c837dc2':
Different bootclasspath for droiddoc.
Ying Wang [Mon, 7 Apr 2014 22:41:21 +0000 (22:41 +0000)]
Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
Ying Wang [Mon, 7 Apr 2014 22:39:06 +0000 (22:39 +0000)]
Merge "Different bootclasspath for droiddoc."
Ying Wang [Mon, 7 Apr 2014 22:31:18 +0000 (22:31 +0000)]
am
cb733bc5: Merge "Fix droiddoc generation."
* commit '
cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
Fix droiddoc generation.
Ying Wang [Mon, 7 Apr 2014 22:26:10 +0000 (22:26 +0000)]
Merge "Fix droiddoc generation."
Ying Wang [Mon, 7 Apr 2014 22:19:33 +0000 (15:19 -0700)]
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
It seems to be a javac/javadoc bug.
See https://code.google.com/p/doclava/issues/detail?id=38
sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar,
but sometimes on some platform javadoc/javac can't find it.
-XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym
and link against rt.jar directly.
Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
Ying Wang [Mon, 7 Apr 2014 22:14:50 +0000 (15:14 -0700)]
Different bootclasspath for droiddoc.
- If it's host module, don't set bootclasspath;
- If it's arget module,
- It can build against the API stubs;
- It can build against a historical SDK version;
- It can build against core.jar
Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
Narayan Kamath [Fri, 25 Oct 2013 14:55:46 +0000 (15:55 +0100)]
Fix droiddoc generation.
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.
This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.
bug:
8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
Ying Wang [Sat, 5 Apr 2014 01:50:50 +0000 (01:50 +0000)]
am
260942fa: Merge "Build with java7 by default."
* commit '
260942fa826052f24455dbaf74e54189efb44e8b':
Build with java7 by default.
Ying Wang [Sat, 5 Apr 2014 01:46:20 +0000 (01:46 +0000)]
Merge "Build with java7 by default."
Narayan Kamath [Tue, 1 Apr 2014 13:16:26 +0000 (14:16 +0100)]
Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).
- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
the more general version check.
- Update the link in the version check error message to the
"initializing" page instead of the "download" page. The latter
talks about repo, mainly.
bug:
8992787
Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
Conflicts:
core/main.mk
Ying Wang [Fri, 4 Apr 2014 23:16:06 +0000 (23:16 +0000)]
am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
b5956468e4cbfbd3a97fa6775b81406c4c949e22':
Disable host -fPIE if BUILD_HOST_static is set.
Ying Wang [Fri, 4 Apr 2014 23:10:27 +0000 (23:10 +0000)]
Merge "Disable host -fPIE if BUILD_HOST_static is set."
Ying Wang [Fri, 4 Apr 2014 21:37:33 +0000 (14:37 -0700)]
Disable host -fPIE if BUILD_HOST_static is set.
It turns out -static doesn't work with -fPIE.
Bug:
13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
Steve Moyer [Fri, 4 Apr 2014 16:36:18 +0000 (16:36 +0000)]
am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
b9d6f6f15c7ea54a55f892654a450fff609b1f5f':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 4 Apr 2014 16:32:06 +0000 (16:32 +0000)]
Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Ying Wang [Thu, 3 Apr 2014 01:51:19 +0000 (01:51 +0000)]
am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
59ff600927033db50ab4ef131ef198c686a5a65b':
Unset _JAVA_OPTIONS before running "java -version".
Ying Wang [Thu, 3 Apr 2014 01:47:18 +0000 (01:47 +0000)]
Merge "Unset _JAVA_OPTIONS before running "java -version"."
Ying Wang [Thu, 3 Apr 2014 01:15:10 +0000 (18:15 -0700)]
Unset _JAVA_OPTIONS before running "java -version".
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.
Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
Greg Hackmann [Wed, 2 Apr 2014 22:58:07 +0000 (22:58 +0000)]
am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
f17508760898e0debeb4ae7ff6455d664577c647':
Revert "HACK: disable emulator on x86_64"
Greg Hackmann [Wed, 2 Apr 2014 22:53:45 +0000 (22:53 +0000)]
Merge "Revert "HACK: disable emulator on x86_64""
Colin Cross [Wed, 2 Apr 2014 17:34:30 +0000 (17:34 +0000)]
am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
45db0e058a8b0177b442b195a6ca5590525fb701':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:28:21 +0000 (17:28 +0000)]
Merge "aosp_arm64: increase userdata image size"
Torne (Richard Coles) [Wed, 2 Apr 2014 17:24:42 +0000 (17:24 +0000)]
am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
c783b9bda96a6fc97076bb877645255fb01596fb':
Add GYP as a target type that requires 2nd arch.
Torne (Richard Coles) [Wed, 2 Apr 2014 17:20:10 +0000 (17:20 +0000)]
Merge "Add GYP as a target type that requires 2nd arch."
Colin Cross [Wed, 2 Apr 2014 16:16:37 +0000 (09:16 -0700)]
aosp_arm64: increase userdata image size
Increase userdata image size to allow make tests to builds with
extra tests to fit.
Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
Narayan Kamath [Wed, 2 Apr 2014 12:23:28 +0000 (12:23 +0000)]
am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:19:49 +0000 (12:19 +0000)]
Merge "Add warning message for java6 builds."
Narayan Kamath [Mon, 17 Feb 2014 18:09:13 +0000 (18:09 +0000)]
Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.
(cherry picked from
8c06afdea3d3c422d653b40fd19d5e3d4be64af2)
Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
Narayan Kamath [Wed, 2 Apr 2014 10:51:15 +0000 (10:51 +0000)]
am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
e28df19e0e553f1590e304c02b19559dbee48098':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)]
am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
2f5de9f50460bbd369abd4218e746553f15f24fb':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:48:33 +0000 (10:48 +0000)]
Merge "Call "java[c] -version" only once"
Ying Wang [Wed, 13 Nov 2013 23:05:15 +0000 (15:05 -0800)]
Call "java[c] -version" only once
and print out the full output if error occurs.
Bug:
11672548
(cherry picked from
7b66d366bf5c469130f71d0870424fcd265e0301)
Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
Narayan Kamath [Wed, 2 Apr 2014 10:45:06 +0000 (10:45 +0000)]
Merge "Bring main.mk in sync with master."
Torne (Richard Coles) [Wed, 2 Apr 2014 10:26:44 +0000 (11:26 +0100)]
Add GYP as a target type that requires 2nd arch.
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.
Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
Nicolas Geoffray [Wed, 2 Apr 2014 08:50:03 +0000 (08:50 +0000)]
am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
38c0ac7386f1956cf06079960886275c483e0706':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:45:55 +0000 (08:45 +0000)]
Merge "Use debug versions of dex2oat explicitly."
Dmitriy Ivanov [Tue, 1 Apr 2014 23:55:45 +0000 (23:55 +0000)]
am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Remove redundant my_target_global_ldflags"
Dmitriy Ivanov [Tue, 1 Apr 2014 23:36:21 +0000 (16:36 -0700)]
Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
so they effectivelly override previous definition
Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
Tim Murray [Tue, 1 Apr 2014 23:28:58 +0000 (23:28 +0000)]
am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
572e9accc05c467d74d3f4fbf2dbc05b8424e302':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:24:56 +0000 (23:24 +0000)]
Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."
Tim Murray [Mon, 24 Mar 2014 21:36:42 +0000 (14:36 -0700)]
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.
bug
13588226
Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
Brian Carlstrom [Tue, 1 Apr 2014 18:23:35 +0000 (18:23 +0000)]
am
47e60739: Merge "cortex-a7 supports div"
* commit '
47e6073979254ef4fbc60554079b2bf19ac32ab1':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:11:22 +0000 (18:11 +0000)]
Merge "cortex-a7 supports div"
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
(cherry picked from commit
cece45d22652ca0d8a57a6cb03c5ca2a915a9a07)
Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
Narayan Kamath [Tue, 1 Apr 2014 16:26:40 +0000 (16:26 +0000)]
am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:21:58 +0000 (16:21 +0000)]
Merge "Add a default value for ro.zygote."
Narayan Kamath [Tue, 1 Apr 2014 12:00:10 +0000 (13:00 +0100)]
Bring main.mk in sync with master.
These lines were removed in aosp in commit
e2d27887b
but a bad merge conflict resolution left them in master.
Subsequent changes on master started using these variables
so they're being brought back.
Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
Nicolas Geoffray [Tue, 25 Mar 2014 11:14:26 +0000 (11:14 +0000)]
Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96