OSDN Git Service
Ian Rogers [Thu, 6 Nov 2014 00:05:36 +0000 (00:05 +0000)]
am
5968de73: Merge "Remove stale dexopt flags."
* commit '
5968de73fb78e2ca8f32ab0588cac92f74a0435e':
Remove stale dexopt flags.
Ian Rogers [Wed, 5 Nov 2014 23:21:40 +0000 (23:21 +0000)]
Merge "Remove stale dexopt flags."
Ian Rogers [Wed, 5 Nov 2014 22:53:53 +0000 (14:53 -0800)]
Remove stale dexopt flags.
Change-Id: Ib58d39012eabd5f854b9434ab922340fcfe43b57
Ying Wang [Wed, 5 Nov 2014 19:01:48 +0000 (19:01 +0000)]
am
7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11"
* commit '
7a301af1e0a3d590e42d3317940e65f739b9f930':
Force colorsheme to SVG, since darkblue doesn't exist on X11
Ying Wang [Wed, 5 Nov 2014 19:01:47 +0000 (19:01 +0000)]
am
8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also"
* commit '
8683612fbd15640ae59daf7ba7c36e1f2ff8e687':
definitions.mk: look for definitions.mk in device/*/build also
Ying Wang [Wed, 5 Nov 2014 18:36:36 +0000 (18:36 +0000)]
Merge "Force colorsheme to SVG, since darkblue doesn't exist on X11"
Ying Wang [Wed, 5 Nov 2014 17:49:59 +0000 (17:49 +0000)]
Merge "definitions.mk: look for definitions.mk in device/*/build also"
Stephen Hines [Tue, 4 Nov 2014 17:44:44 +0000 (17:44 +0000)]
am
35e4ede5: Merge "Use automatic color option with the latest clang."
* commit '
35e4ede5974053d05ae0f8791e60ba77a31907b3':
Use automatic color option with the latest clang.
Stephen Hines [Tue, 4 Nov 2014 17:41:36 +0000 (17:41 +0000)]
Merge "Use automatic color option with the latest clang."
Stephen Hines [Tue, 4 Nov 2014 07:39:49 +0000 (23:39 -0800)]
Use automatic color option with the latest clang.
Bug:
18187181
Now that I checked in the latest prebuilts, clang will automatically use
color on terminals and no color on redirection to files or non-terminals.
Change-Id: I9be00c44947946cc18ce59c936b7f45d0ce2b6fc
Dan Albert [Mon, 3 Nov 2014 17:40:31 +0000 (17:40 +0000)]
am
ce915d95: Merge "Never use ASAN for acp."
* commit '
ce915d950aaea86e566c8aec06be181a65c17cf2':
Never use ASAN for acp.
Dan Albert [Mon, 3 Nov 2014 17:36:13 +0000 (17:36 +0000)]
Merge "Never use ASAN for acp."
Dmitriy Ivanov [Sat, 1 Nov 2014 01:17:51 +0000 (01:17 +0000)]
am
bd0e8af7: Merge "Replacement for gdbclient"
* commit '
bd0e8af734d5b6e28e2710bf53beb1b674e3fdb2':
Replacement for gdbclient
Dmitriy Ivanov [Sat, 1 Nov 2014 01:13:38 +0000 (01:13 +0000)]
Merge "Replacement for gdbclient"
Dmitriy Ivanov [Fri, 31 Oct 2014 05:00:17 +0000 (22:00 -0700)]
Replacement for gdbclient
Differences between this implementation and the old one:
1. Resolves symbols/gdb based on device information (lunch
target is irrelevant)
2. Works with downloaded from build-server symbols
3. Does not require user to specify exe file - detects it automatically
Change-Id: I4e7ce0a51868634593a9f104fe3f2fa67b54ca9f
Dan Albert [Fri, 31 Oct 2014 23:30:26 +0000 (16:30 -0700)]
Never use ASAN for acp.
Since acp is needed to build the ASAN libs, we can't use ASAN to
instrument it. Since libhost is included statically in acp, we can't
instrument that either.
Change-Id: Idb389df945380b6ef447fc3d3ead8be27ec09011
Nick Kralevich [Fri, 31 Oct 2014 18:31:34 +0000 (18:31 +0000)]
am
36084e64: Merge "Label goldfish block devices with their own types."
* commit '
36084e64a1b603f0ca848bba5ca91938f853dc4c':
Label goldfish block devices with their own types.
Nick Kralevich [Fri, 31 Oct 2014 18:27:17 +0000 (18:27 +0000)]
Merge "Label goldfish block devices with their own types."
Stephen Smalley [Fri, 31 Oct 2014 18:19:55 +0000 (14:19 -0400)]
Label goldfish block devices with their own types.
This assigns block device types as per device/generic/goldfish/fstab.goldfish.
Eliminates (permissive) avc: denied messages for fsck.
Change-Id: Ia72bdfb16975f051548b6b2c0636e4f907295789
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Nick Kralevich [Fri, 31 Oct 2014 17:36:28 +0000 (17:36 +0000)]
am
dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
* commit '
dfa2f8a6e309bca516a11d83abd1aa8733acce69':
Mark qemu_device as a mlstrustedobject.
Nick Kralevich [Fri, 31 Oct 2014 17:30:14 +0000 (17:30 +0000)]
Merge "Mark qemu_device as a mlstrustedobject."
Stephen Smalley [Fri, 31 Oct 2014 17:28:09 +0000 (13:28 -0400)]
Mark qemu_device as a mlstrustedobject.
Allow apps running with any level to write to it.
Change-Id: I8fca1f377e14c624db5273bdacf8400addc6210d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Ying Wang [Thu, 30 Oct 2014 23:43:02 +0000 (23:43 +0000)]
am
871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
* commit '
871b8df128b144f39d40889e463722a032c4d246':
Add -fcolor-diagnostics to global clang cflags.
Ying Wang [Thu, 30 Oct 2014 21:18:02 +0000 (21:18 +0000)]
Merge "Add -fcolor-diagnostics to global clang cflags."
Ying Wang [Thu, 30 Oct 2014 19:22:29 +0000 (12:22 -0700)]
Add -fcolor-diagnostics to global clang cflags.
Bug:
18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
Chih-hung Hsieh [Thu, 30 Oct 2014 01:55:45 +0000 (01:55 +0000)]
Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit
f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b.
Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
Chih-Hung Hsieh [Wed, 29 Oct 2014 21:46:15 +0000 (14:46 -0700)]
Continue to use march=i686 before fix of g++ ICE.
BUG:
18174291
BUG:
18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
Jeff Davidson [Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)]
am
427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
Jeff Davidson [Wed, 29 Oct 2014 17:35:16 +0000 (17:35 +0000)]
Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
Ian Rogers [Wed, 29 Oct 2014 12:32:37 +0000 (12:32 +0000)]
am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
Specify -mcpu=krait for clang.
Ian Rogers [Tue, 28 Oct 2014 23:03:36 +0000 (23:03 +0000)]
Merge "Specify -mcpu=krait for clang."
Ian Rogers [Tue, 28 Oct 2014 22:50:02 +0000 (15:50 -0700)]
Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
Andrew Boie [Tue, 28 Oct 2014 15:32:11 +0000 (08:32 -0700)]
definitions.mk: look for definitions.mk in device/*/build also
build/core/Makefile looks for build tasks in either device/*/build/tasks
or vendor/*/build/tasks. Do the same with vendor-specific definitions.mk.
Change-Id: Ib4fd00a1d0effe8e347382a922da101ce26bf696
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Neil Fuller [Tue, 28 Oct 2014 04:50:49 +0000 (04:50 +0000)]
am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:48:54 +0000 (04:48 +0000)]
am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
717ebfc13182202ab38e17c0cd008924e9e5c4e9':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Tue, 28 Oct 2014 04:46:53 +0000 (04:46 +0000)]
am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
d274e04ac4317d7cfc2de02ca215e064c018c234':
Don't sort shared library link order.
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:46:49 +0000 (04:46 +0000)]
am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
Raise x86 arch requirement to prescott.
Marcos Marado [Wed, 22 Oct 2014 13:19:34 +0000 (14:19 +0100)]
Force colorsheme to SVG, since darkblue doesn't exist on X11
Change-Id: I1b9e13dd4ca63ba27a49a55d95130bdceb187669
Neil Fuller [Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)]
am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
4dfda1fa4201e41022396b77054168ffc73b590c':
Remove Java 6 build support
Chih-Hung Hsieh [Fri, 24 Oct 2014 13:02:00 +0000 (13:02 +0000)]
am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
Set default to Clang integrated assembler.
Neil Fuller [Fri, 24 Oct 2014 08:16:03 +0000 (08:16 +0000)]
Merge "Add OpenJDK 8 experimental support"
Chih-Hung Hsieh [Fri, 24 Oct 2014 00:26:20 +0000 (00:26 +0000)]
Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
Chih-Hung Hsieh [Thu, 23 Oct 2014 23:39:09 +0000 (16:39 -0700)]
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
BUG:
18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
Dan Albert [Thu, 23 Oct 2014 22:20:01 +0000 (22:20 +0000)]
Merge "Don't sort shared library link order."
Dan Albert [Thu, 23 Oct 2014 21:04:02 +0000 (14:04 -0700)]
Don't sort shared library link order.
Only sort the list of shared libraries used for naming dependencies,
not the order they are actually linked in. The order in which shared
libraries appear to the linker affects which symbols get used if there
is a multiply defined symbol.
Also link system shared libraries _after_ user provided libraries,
since a user will want their functions to override the system's if
they exist.
Change-Id: I071059d940d40a648d69d90e0699073ef520138a
Chih-Hung Hsieh [Thu, 23 Oct 2014 20:47:29 +0000 (20:47 +0000)]
Merge "Raise x86 arch requirement to prescott."
Jeff Davidson [Tue, 16 Sep 2014 00:51:11 +0000 (17:51 -0700)]
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
If a module is explicitly depending on a versioned protolib, we strip
the dependency and log a warning so the unneeded dependency can be
removed.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
Add OpenJDK 8 experimental support
Targeting 1.7: just adding support for the tools.
Various issues exist with OpenJDK 8: it doesn't build to completion
yet.
Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
Neil Fuller [Thu, 23 Oct 2014 09:00:13 +0000 (09:00 +0000)]
Merge "Remove Java 6 build support"
Bill Yi [Wed, 22 Oct 2014 22:44:51 +0000 (15:44 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:35:08 +0000 (14:35 -0700)]
Raise x86 arch requirement to prescott.
Atomic functions used in external/libcxx/include/atomic when compiled with Clang
will require intrinsic functions exist only for prescott or newer CPUs.
BUG:
17530542
Change-Id: I0c9660ed2ffa75b940981eb8165d88934b39aec5
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:07:47 +0000 (21:07 +0000)]
Merge "Set default to Clang integrated assembler."
Chih-Hung Hsieh [Wed, 22 Oct 2014 16:21:53 +0000 (09:21 -0700)]
Set default to Clang integrated assembler.
BUG:
17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
Bill Yi [Wed, 22 Oct 2014 15:45:57 +0000 (08:45 -0700)]
Ying Wang [Wed, 22 Oct 2014 13:12:13 +0000 (13:12 +0000)]
am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
Ying Wang [Wed, 22 Oct 2014 01:37:15 +0000 (01:37 +0000)]
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Tue, 21 Oct 2014 20:20:56 +0000 (20:20 +0000)]
am
18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '
18cd02257d7045543ba435aa1efa497c8a780f27':
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Ying Wang [Tue, 21 Oct 2014 19:19:15 +0000 (19:19 +0000)]
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
Ying Wang [Fri, 17 Oct 2014 22:07:24 +0000 (15:07 -0700)]
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Previously ccache is disabled when it fails calling clang's preprocessor with
unused arguments (such as '-Wa,--noexecstack') in the command line.
See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
(-Qunused-arguments suppresses more than
-Wno-unused-command-line-argument does.)
Change-Id: I6cde307632c8395c053eb28063d7844d93070562
Adam Lesinski [Tue, 21 Oct 2014 00:01:15 +0000 (00:01 +0000)]
am
318217a8: Enable building of gtest for Windows
* commit '
318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Adam Lesinski [Mon, 20 Oct 2014 23:06:44 +0000 (16:06 -0700)]
Enable building of gtest for Windows
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.
Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
Dan Albert [Mon, 20 Oct 2014 22:42:11 +0000 (22:42 +0000)]
am
cc0aa4da: am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:36:45 +0000 (22:36 +0000)]
am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
28c265ddddebeabc0597e976fbc817b70c46abc2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:33:49 +0000 (22:33 +0000)]
Merge "We also need -rdynamic for host ASAN."
Dan Albert [Mon, 20 Oct 2014 20:30:00 +0000 (13:30 -0700)]
We also need -rdynamic for host ASAN.
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
Dan Albert [Mon, 20 Oct 2014 20:37:18 +0000 (13:37 -0700)]
resolved conflicts for merge of
96c22133 to lmp-dev-plus-aosp
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
Dan Albert [Mon, 20 Oct 2014 20:28:43 +0000 (20:28 +0000)]
am
1f134dd0: Merge "Add support for ASAN in host modules."
* commit '
1f134dd06cd12f032c833b9a43b476a9557fa8da':
Add support for ASAN in host modules.
Dan Albert [Mon, 20 Oct 2014 20:24:07 +0000 (20:24 +0000)]
Merge "Add support for ASAN in host modules."
Dan Albert [Mon, 20 Oct 2014 18:37:18 +0000 (11:37 -0700)]
Add support for ASAN in host modules.
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
Stephen Hines [Mon, 20 Oct 2014 18:30:08 +0000 (18:30 +0000)]
am
7d86749d: am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:19:25 +0000 (18:19 +0000)]
am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
ed8206dba48e182f786ec677d56586ffaf973250':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:06:34 +0000 (18:06 +0000)]
Merge "Remove unnecessary 10.8-specific build rules"
Dan Albert [Sat, 18 Oct 2014 02:42:07 +0000 (02:42 +0000)]
am
ec28a489: am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 02:25:40 +0000 (02:25 +0000)]
am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
28c2d3b9852550bc9ae150e2725e08885f1ade73':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 01:05:36 +0000 (01:05 +0000)]
Merge "Fix breakage for x86_64 static executables."
Stephen Hines [Sat, 18 Oct 2014 00:36:42 +0000 (17:36 -0700)]
Remove unnecessary 10.8-specific build rules
We no longer need gcc for host builds, since those all run through clang. This
header include, however, triggers errors about SSE intrinsics by replacing
the more relevant include dirs that we should be using.
Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
Dan Albert [Fri, 17 Oct 2014 23:58:38 +0000 (16:58 -0700)]
Fix breakage for x86_64 static executables.
Yikes. Don't know how this slipped through code review.
I had actually mentioned a need for cleanup in this part of the build
system earlier, since the amount of duplication between
transform-o-to-* for each arch means we might fix things incorrectly
in one of them (as I've just shown). Similarly, code reviewers are
likely to skim each one after the first if they all look close enough
(which is presumably what happened here).
Change-Id: I9b85914510f0b114485021deb97f42740712aae5
Clay Murphy [Fri, 17 Oct 2014 19:52:28 +0000 (19:52 +0000)]
am
327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '
327180f5d2009be990076f152dffb244939b1673':
Docs: Fixing link, adding Android Partner logo.
Clay Murphy [Fri, 17 Oct 2014 19:47:51 +0000 (19:47 +0000)]
Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
Dan Albert [Fri, 17 Oct 2014 17:53:07 +0000 (17:53 +0000)]
am
fb77fe99: am
26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit '
fb77fe99b7a6ef0ce016f187d79ac5d9c75742ba':
Use libstc++ for the name of bionic's STL.
Dan Albert [Fri, 17 Oct 2014 17:48:24 +0000 (17:48 +0000)]
am
26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit '
26707ca8bb29b62252dd9d3d346f731f4fad2806':
Use libstc++ for the name of bionic's STL.
Dan Albert [Fri, 17 Oct 2014 17:44:36 +0000 (17:44 +0000)]
Merge "Use libstc++ for the name of bionic's STL."
smain@google.com [Fri, 17 Oct 2014 17:00:47 +0000 (17:00 +0000)]
am
be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit '
be113f8ac0f5ae00fa997db5f4507af55c523367':
fix broken download buttons, make a[name] offset apply only to reference docs
smain@google.com [Fri, 17 Oct 2014 16:56:10 +0000 (09:56 -0700)]
fix broken download buttons, make a[name] offset apply only to reference docs
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
smain@google.com [Fri, 17 Oct 2014 08:33:52 +0000 (08:33 +0000)]
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
automerge:
947f3e9
* commit '
947f3e9ecf9bc7875d210a45053826eb0e110186':
fix z-order of hangouts to avoid clobbering the search suggest
smain@google.com [Fri, 17 Oct 2014 08:27:18 +0000 (08:27 +0000)]
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 08:21:13 +0000 (01:21 -0700)]
fix z-order of hangouts to avoid clobbering the search suggest
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
Ian Rogers [Fri, 17 Oct 2014 07:44:14 +0000 (07:44 +0000)]
am
0251f345: am
fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '
0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
Ian Rogers [Fri, 17 Oct 2014 07:34:45 +0000 (07:34 +0000)]
am
fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '
fc82be6e776acfc3d784e61e2026d65417285495':
Add LPAE to dex2oat ISA feature list.
Joe Fernandez [Fri, 17 Oct 2014 05:50:19 +0000 (05:50 +0000)]
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
automerge:
e321df0
* commit '
e321df0ca2eaada3e126393a7976cd4cc09afdf6':
Doc change: update query params to force refresh of local js files.
Joe Fernandez [Fri, 17 Oct 2014 05:41:07 +0000 (05:41 +0000)]
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:34:36 +0000 (05:34 +0000)]
Merge "fix scroll offset when loading non-header pages" into lmp-dev
automerge:
19c6780
* commit '
19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
smain@google.com [Fri, 17 Oct 2014 05:18:08 +0000 (05:18 +0000)]
Merge "fix scroll offset when loading non-header pages" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:10:00 +0000 (22:10 -0700)]
fix scroll offset when loading non-header pages
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
David Friedman [Fri, 17 Oct 2014 05:03:02 +0000 (05:03 +0000)]
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
automerge:
e0471a8
* commit '
e0471a82276d86c671a9e2a21f58eb140cb94dc0':
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
Dan Albert [Fri, 17 Oct 2014 04:18:15 +0000 (21:18 -0700)]
Use libstc++ for the name of bionic's STL.
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).
Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
Ian Rogers [Fri, 17 Oct 2014 03:56:42 +0000 (03:56 +0000)]
Merge "Add LPAE to dex2oat ISA feature list."
Clay Murphy [Fri, 17 Oct 2014 01:23:58 +0000 (18:23 -0700)]
Docs: Fixing link, adding Android Partner logo.
Bug:
17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d