OSDN Git Service
Ying Wang [Tue, 6 May 2014 16:20:51 +0000 (16:20 +0000)]
am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:18:56 +0000 (16:18 +0000)]
Merge "add silvermont x86 architecture"
Ying Wang [Tue, 6 May 2014 02:03:55 +0000 (02:03 +0000)]
am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:01:58 +0000 (02:01 +0000)]
Merge "Increase system image size of generic_x86_64 to 750MB."
Ying Wang [Tue, 6 May 2014 02:01:28 +0000 (19:01 -0700)]
Increase system image size of generic_x86_64 to 750MB.
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
Colin Cross [Mon, 5 May 2014 23:05:14 +0000 (23:05 +0000)]
am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
5128237ad3312523c5a1390efce33ad77f0f2ff0':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:02:45 +0000 (23:02 +0000)]
Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
Colin Cross [Mon, 5 May 2014 22:25:41 +0000 (15:25 -0700)]
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.
Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
Colin Cross [Mon, 5 May 2014 20:14:18 +0000 (20:14 +0000)]
am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
2ff8919de339209412d9da2a524f566dfcf5847f':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:11:28 +0000 (20:11 +0000)]
Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Ying Wang [Mon, 5 May 2014 18:41:32 +0000 (18:41 +0000)]
am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:37:29 +0000 (18:37 +0000)]
Merge "Increase system image size of generic_x86_64 to 650MB."
Ying Wang [Mon, 5 May 2014 18:33:06 +0000 (11:33 -0700)]
Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
Tim Murray [Fri, 2 May 2014 18:24:20 +0000 (18:24 +0000)]
am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
d720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:21:34 +0000 (18:21 +0000)]
Merge "Add -no-integrated-as for ARM64."
Ying Wang [Fri, 2 May 2014 04:00:30 +0000 (04:00 +0000)]
am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
a6b8025a815cc5c9b441a91917f100486c270446':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 03:57:32 +0000 (03:57 +0000)]
Merge "Add WITH_DEXPREOPT to the list of protected global variables."
Ying Wang [Fri, 2 May 2014 03:55:30 +0000 (20:55 -0700)]
Add WITH_DEXPREOPT to the list of protected global variables.
Bug:
14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
Colin Cross [Thu, 1 May 2014 00:42:03 +0000 (17:42 -0700)]
build: add core_64_bit.mk
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
Colin Cross [Thu, 1 May 2014 01:18:02 +0000 (18:18 -0700)]
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.
Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.
Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
Torne (Richard Coles) [Thu, 1 May 2014 09:20:19 +0000 (09:20 +0000)]
am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
a0267df234db59d34891a01e0761233abc9ae4b1':
Remove libpac and v8 from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 1 May 2014 09:17:25 +0000 (09:17 +0000)]
Merge "Remove libpac and v8 from the 64-bit blacklist."
Colin Cross [Thu, 1 May 2014 01:09:13 +0000 (18:09 -0700)]
build: split TARGET_PREFER_32_BIT for apps and executables
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables. If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.
Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
Tim Murray [Wed, 30 Apr 2014 22:55:52 +0000 (15:55 -0700)]
Add -no-integrated-as for ARM64.
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
Tim Murray [Wed, 30 Apr 2014 21:52:33 +0000 (21:52 +0000)]
am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
Remove tblgen and clang-tblgen from prebuilts.
Tim Murray [Wed, 30 Apr 2014 21:49:34 +0000 (21:49 +0000)]
Merge "Remove tblgen and clang-tblgen from prebuilts."
Tim Murray [Wed, 30 Apr 2014 20:54:32 +0000 (13:54 -0700)]
Remove tblgen and clang-tblgen from prebuilts.
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
Narayan Kamath [Wed, 30 Apr 2014 15:12:53 +0000 (15:12 +0000)]
am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
475a3d17d7594ee2b8bcf1ac826c490b49f116df':
Use java_home to determine jdk location.
Narayan Kamath [Wed, 30 Apr 2014 10:45:51 +0000 (10:45 +0000)]
Merge "Use java_home to determine jdk location."
Jason Parks [Mon, 28 Apr 2014 18:32:10 +0000 (13:32 -0500)]
Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.
(cherry-picked from commit
13b2e19ef240804908629ed2e54a98ec9dede337)
Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
Bill Yi [Tue, 29 Apr 2014 18:32:53 +0000 (11:32 -0700)]
Andrew Boie [Wed, 5 Mar 2014 20:10:01 +0000 (12:10 -0800)]
add silvermont x86 architecture
This is used for Baytrail targets.
Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Torne (Richard Coles) [Tue, 29 Apr 2014 09:22:49 +0000 (10:22 +0100)]
Remove libpac and v8 from the 64-bit blacklist.
external/chromium-libpac has been updated to depend on the copy of V8 in
external/chromium_org, and its makefiles updated to be multilib-safe.
external/v8 is thus unused and has been removed from the tree.
Bug:
12452053
Change-Id: I757fa187f7f67cd9a89d4b228d4ce3ed6d2858b1
Andrew Hsieh [Tue, 29 Apr 2014 00:08:21 +0000 (00:08 +0000)]
am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
8afa25552efb51286fe0f010f0bf78fea71fc12a':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
Andrew Hsieh [Mon, 28 Apr 2014 22:52:49 +0000 (22:52 +0000)]
Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
Torne (Richard Coles) [Mon, 28 Apr 2014 16:00:30 +0000 (16:00 +0000)]
am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
7250b63a1a3e726aa83e2351b23f2d0c79903247':
Fix PATH setup for arm64.
Torne (Richard Coles) [Mon, 28 Apr 2014 15:54:23 +0000 (15:54 +0000)]
Merge "Fix PATH setup for arm64."
Torne (Richard Coles) [Fri, 25 Apr 2014 15:24:22 +0000 (16:24 +0100)]
Fix PATH setup for arm64.
On architectures other than "arm", the combination of
ANDROID_KERNEL_TOOLCHAIN_PATH being empty, and CODE_REVIEWS being empty,
leads to adding a :: into the user's PATH, which is highly undesirable.
Neither CODE_REVIEWS nor the mips toolchaindir is ever used, so just
remove them, and make sure we only include the extra colon when setting
the kernel toolchain path to a non-empty value.
Change-Id: I2dfa7d3a322b56b6abbc47476082dc6ae4dd6a82
Andrew Hsieh [Sat, 26 Apr 2014 06:47:10 +0000 (23:47 -0700)]
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib
See https://android-review.googlesource.com/#/c/92441/
Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
Ying Wang [Fri, 25 Apr 2014 21:59:35 +0000 (21:59 +0000)]
am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
676e11fed82c5a4afb02d1082472fad14e625915':
include LGPL projects in GPL archives
Ying Wang [Fri, 25 Apr 2014 21:56:26 +0000 (21:56 +0000)]
Merge "include LGPL projects in GPL archives"
Stephen Hines [Fri, 25 Apr 2014 20:53:02 +0000 (20:53 +0000)]
am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
9956bb6aebf5084b730e9f4ac4d00b3a7c4a2f27':
Build changes necessary for LLVM 3.5 switch.
Stephen Hines [Fri, 25 Apr 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Build changes necessary for LLVM 3.5 switch."
Tim Murray [Thu, 3 Apr 2014 23:06:59 +0000 (16:06 -0700)]
Build changes necessary for LLVM 3.5 switch.
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03
Conflicts:
core/clang/arm.mk
Elliott Hughes [Thu, 24 Apr 2014 16:23:42 +0000 (16:23 +0000)]
am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
847fd0311f6c82b8ac90d970cfc68aafd9913471':
Leave 'linux' defined on x86/x86-64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:20:02 +0000 (16:20 +0000)]
am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
1076c5685b1f1dd0f8b691466f6e16259722ca56':
Leave 'linux' defined on mips/mips64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:19:17 +0000 (16:19 +0000)]
Merge "Leave 'linux' defined on x86/x86-64, like arm."
Elliott Hughes [Thu, 24 Apr 2014 16:16:06 +0000 (16:16 +0000)]
Merge "Leave 'linux' defined on mips/mips64, like arm."
Torne (Richard Coles) [Thu, 24 Apr 2014 15:53:33 +0000 (15:53 +0000)]
am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
3467048f3f5a483ca2fff529ebd4c8d3b7827143':
Remove chromium_org and webview from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 24 Apr 2014 15:49:44 +0000 (15:49 +0000)]
Merge "Remove chromium_org and webview from the 64-bit blacklist."
Torne (Richard Coles) [Thu, 24 Apr 2014 12:29:03 +0000 (13:29 +0100)]
Remove chromium_org and webview from the 64-bit blacklist.
external/chromium_org has been updated to handle 64-bit architectures
correctly in its makefiles; remove it from the blacklist so we can start
experimenting with building a 64/32 multilib version.
Change-Id: Ieb0e4f3cfea1578e01954c4656df90cd8d36b8cc
Elliott Hughes [Thu, 24 Apr 2014 06:24:36 +0000 (23:24 -0700)]
Leave 'linux' defined on mips/mips64, like arm.
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
Elliott Hughes [Thu, 24 Apr 2014 06:09:30 +0000 (23:09 -0700)]
Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
Andrew Hsieh [Thu, 24 Apr 2014 01:06:42 +0000 (01:06 +0000)]
am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
db55f602be5434c0a2b7ffdfe601878d910f0914':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Andrew Hsieh [Thu, 24 Apr 2014 00:40:27 +0000 (00:40 +0000)]
Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
Andrew Hsieh [Fri, 21 Mar 2014 13:05:45 +0000 (21:05 +0800)]
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
Ying Wang [Wed, 23 Apr 2014 00:15:12 +0000 (00:15 +0000)]
am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
871bc703e57d5b7629c043a54f5ac2614a17981b':
Update build system for better Clang behavior on Mac.
Ying Wang [Wed, 23 Apr 2014 00:12:06 +0000 (00:12 +0000)]
Merge "Update build system for better Clang behavior on Mac."
Tim Murray [Mon, 21 Apr 2014 21:00:31 +0000 (14:00 -0700)]
Update build system for better Clang behavior on Mac.
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
Ian Rogers [Tue, 22 Apr 2014 15:43:04 +0000 (15:43 +0000)]
am
850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '
850299f6a6a831d47af68a3004a62df21b5fee3a':
Make the zygote 64-bit for the x86-64 emulator.
Ian Rogers [Tue, 22 Apr 2014 15:41:32 +0000 (15:41 +0000)]
Merge "Make the zygote 64-bit for the x86-64 emulator."
Ian Rogers [Fri, 21 Mar 2014 23:31:33 +0000 (16:31 -0700)]
Make the zygote 64-bit for the x86-64 emulator.
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
Ying Wang [Fri, 18 Apr 2014 23:59:52 +0000 (23:59 +0000)]
am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
488b23d96dc796e457d8df4d7775cefcf68320af':
Update rules to install JNI libraries.
Ying Wang [Fri, 18 Apr 2014 23:54:43 +0000 (23:54 +0000)]
Merge "Update rules to install JNI libraries."
Ying Wang [Thu, 17 Apr 2014 20:38:04 +0000 (13:38 -0700)]
Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.
The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
installed to system partitions, we'll embed the jni libs in the
built apk.
- Otherwise, the jni libraries will be installed to the system
lib path, and symlinks created in the app specific lib path.
Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
Ian Rogers [Fri, 18 Apr 2014 23:15:17 +0000 (23:15 +0000)]
am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
67c209281ff0454213bc117691214bc67ad5a7f2':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Ian Rogers [Fri, 18 Apr 2014 23:10:30 +0000 (23:10 +0000)]
Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled."
Ian Rogers [Fri, 18 Apr 2014 22:23:40 +0000 (15:23 -0700)]
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
Ben Cheng [Fri, 18 Apr 2014 21:12:27 +0000 (21:12 +0000)]
am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
5c72b7266640ad8703d049910431c9ce7b91a9cd':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ben Cheng [Fri, 18 Apr 2014 18:35:29 +0000 (18:35 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
Ben Cheng [Fri, 18 Apr 2014 18:34:35 +0000 (18:34 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
This reverts commit
084a7f83875d030c2e4819bed386c4a16168e731.
GCC 4.9 still has stability issues (b/
14160872)
Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
Ben Cheng [Thu, 17 Apr 2014 17:02:25 +0000 (17:02 +0000)]
am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
63030fe60842d9385f75d5ecdd17aa11a67a4e05':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
Ben Cheng [Thu, 17 Apr 2014 16:54:24 +0000 (16:54 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ben Cheng [Wed, 16 Apr 2014 19:18:14 +0000 (12:18 -0700)]
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
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: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
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)"
Andrew Boie [Tue, 10 Dec 2013 21:52:00 +0000 (13:52 -0800)]
include LGPL projects in GPL archives
LGPL projects need their source code distributed under very
similar conditions to GPL and MPL, the only difference is the
conditions under which they may be linked. It makes sense to
include them in the GPL archive tarballs.
Change-Id: I2c2df03906bfeee55566102aa688e4cdc283700b
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
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