OSDN Git Service
Ying Wang [Fri, 2 May 2014 04:03:18 +0000 (04:03 +0000)]
am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
887a52d02251a1a94f8e17ecbfe26ba15ece6af5':
Add WITH_DEXPREOPT to the list of protected global variables.
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
Torne (Richard Coles) [Thu, 1 May 2014 09:25:02 +0000 (09:25 +0000)]
am
f0b5bfec: am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
f0b5bfec7b0a715cd09da7540f0a772e31b65c71':
Remove libpac and v8 from the 64-bit blacklist.
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."
Tim Murray [Wed, 30 Apr 2014 21:54:08 +0000 (21:54 +0000)]
am
27fe9406: am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
27fe940676b568bb9a0af889028495fab73853f2':
Remove tblgen and clang-tblgen from prebuilts.
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:37:38 +0000 (15:37 +0000)]
am
3f1d1608: am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
3f1d1608ebc4a0c307c94b67943bee004d8428a1':
Use java_home to determine jdk location.
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 [Wed, 30 Apr 2014 00:49:23 +0000 (00:49 +0000)]
am
1e4adfa8: (-s ours) Merge commit \'
8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '
1e4adfa837c77dc2dcb73ce2c0b32bf362e80000':
Try to catch more misuse of $(my-dir).
Revert "Remove external/chromium from the 64 bit blacklist."
Remove external/chromium from the 64 bit blacklist.
OProfile is no longer compiled now.
Amend 64 bit blacklist.
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
Remove external/tcpdump from 64-bit build blacklist.
oprofile/daemon doesn't build for x86_64.
Remove external/wpa_supplicant_8 and external/android-clat
Take libcore off the LP64 blacklist.
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Bill Yi [Tue, 29 Apr 2014 18:32:53 +0000 (11:32 -0700)]
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:12:01 +0000 (00:12 +0000)]
am
f14ba5b9: am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
f14ba5b93583b33ad47b22b9de07c3907b8b5074':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
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:06:24 +0000 (16:06 +0000)]
am
5646d2f6: am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
5646d2f6aa851ca79440d573e73fa51cf6afaf81':
Fix PATH setup for arm64.
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 22:03:07 +0000 (22:03 +0000)]
am
1427f872: am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
1427f872b99c4e019fe0b5a75a283bed68814204':
include LGPL projects in GPL archives
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:57:30 +0000 (20:57 +0000)]
am
9661b09f: am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
9661b09ff1fb43014d7777b391531ebe59dd83bc':
Build changes necessary for LLVM 3.5 switch.
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."
Ying Wang [Fri, 25 Apr 2014 16:13:55 +0000 (16:13 +0000)]
am
c564b691: Remove libs from target/product/base.mk.
* commit '
c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
Ying Wang [Fri, 25 Apr 2014 00:12:58 +0000 (17:12 -0700)]
Remove libs from target/product/base.mk.
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.
Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
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:27:28 +0000 (16:27 +0000)]
am
7cad688e: am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
7cad688ea267df86ceb9c7fbfd6bc463af4580b1':
Leave 'linux' defined on x86/x86-64, like arm.
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:23:33 +0000 (16:23 +0000)]
am
62911d47: am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
62911d473e0798a626cdf8773eab0a7f6c461d1b':
Leave 'linux' defined on mips/mips64, 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:58:52 +0000 (15:58 +0000)]
am
081c1c59: am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
081c1c5943aacb3cb05615793ecc33a75ae26b17':
Remove chromium_org and webview from the 64-bit blacklist.
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
Andrew Hsieh [Thu, 24 Apr 2014 09:02:32 +0000 (09:02 +0000)]
am
9754735f: am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
9754735f7e86bd7647796a6d804c18e6be94675c':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
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:17:31 +0000 (00:17 +0000)]
am
f1a3d5e8: am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
f1a3d5e8ab2064f9ab4ba3d1a6d594c1905624da':
Update build system for better Clang behavior on Mac.
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:45:44 +0000 (15:45 +0000)]
am
f1d5dcdd: am
850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '
f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
Make the zygote 64-bit for the x86-64 emulator.
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 [Sat, 19 Apr 2014 00:05:09 +0000 (00:05 +0000)]
am
a59c2935: am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
a59c2935bc63babded85aa1ce1a8b00e28dc6a11':
Update rules to install JNI libraries.
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:18:43 +0000 (23:18 +0000)]
am
9b3fb2c3: am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
9b3fb2c32b89b3d20d6dda521ea3cd81ec75ce19':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
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:15:29 +0000 (21:15 +0000)]
am
26232093: am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
26232093bbec1a29aac18dbf2b18d9150632711d':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
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:08:06 +0000 (17:08 +0000)]
am
dc82c5a8: am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
dc82c5a8c04da516057a75b212a3e9d1824628a3':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
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:09:06 +0000 (17:09 +0000)]
am
6350c21e: am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
6350c21eaf50435471751808ad343b0143712bae':
Explicitly link libstdc++.a for static gtest executables.
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:36:05 +0000 (23:36 +0000)]
am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
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."
Andrew Hsieh [Tue, 15 Apr 2014 21:44:17 +0000 (21:44 +0000)]
am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
041d44705205f7b36108bcc3a9dafe321e301221':
Add -Wl,-maarch64linux
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
Ying Wang [Tue, 15 Apr 2014 16:12:26 +0000 (16:12 +0000)]
am
fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
* commit '
fcd22c8848b829eec7e661fb270fea1a18bcba28':
Allow to build target-files.zip in sdk build.
Ying Wang [Tue, 15 Apr 2014 16:07:03 +0000 (16:07 +0000)]
Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
Narayan Kamath [Tue, 15 Apr 2014 11:06:26 +0000 (11:06 +0000)]
am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
60b9496c016f81df8f1c4202ba8a5190543900d5':
"desktop" linux has Posix clocks.
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."
Scott Main [Tue, 15 Apr 2014 02:46:17 +0000 (02:46 +0000)]
am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
cdbb12418943889a86576b24ae91ddd6a2b5340e':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:44:48 +0000 (02:44 +0000)]
am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
01adbdcb954e2d694ec40ac149f07c44defcc796':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:42:10 +0000 (02:42 +0000)]
am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
613b251b7b4b54507561ee52811c72fcd2ba731d':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)]
Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
Scott Main [Tue, 15 Apr 2014 02:00:12 +0000 (19:00 -0700)]
remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.
Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
Ying Wang [Tue, 15 Apr 2014 00:25:43 +0000 (17:25 -0700)]
Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.
Bug:
13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
Scott Main [Mon, 14 Apr 2014 15:01:48 +0000 (15:01 +0000)]
am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
3829f62188161fe7528e18de7bb226896611fee0':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Scott Main [Mon, 14 Apr 2014 14:58:17 +0000 (14:58 +0000)]
am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
b1a6d6441a02478569e57a5da5b9655dd1409efa':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.