OSDN Git Service
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 [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: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
Ying Wang [Thu, 16 Oct 2014 21:09:06 +0000 (21:09 +0000)]
am
b3f42ed0: am
4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
* commit '
b3f42ed09a141b23c0738a828788b3d77d610b4b':
Fix Java detection on some Linux distributions
Ying Wang [Thu, 16 Oct 2014 21:03:04 +0000 (21:03 +0000)]
am
4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
* commit '
4e3e9ffbf314500d303724aefbddf1b89094cfd8':
Fix Java detection on some Linux distributions
Ying Wang [Thu, 16 Oct 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Fix Java detection on some Linux distributions"
Ian Rogers [Thu, 16 Oct 2014 20:13:05 +0000 (20:13 +0000)]
am
defe864a: am
07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit '
defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
Ian Rogers [Thu, 16 Oct 2014 20:07:27 +0000 (20:07 +0000)]
am
07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit '
07b212ac59f0018a01ad3262caa0b96b9aff30a1':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
Ian Rogers [Thu, 16 Oct 2014 20:06:05 +0000 (13:06 -0700)]
Add LPAE to dex2oat ISA feature list.
Bug:
17993736
Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
Ian Rogers [Thu, 16 Oct 2014 20:02:25 +0000 (20:02 +0000)]
Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
David Friedman [Wed, 15 Oct 2014 09:21:19 +0000 (02:21 -0700)]
Changes to NDK download table format to reflect change in download structure
Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
Change-Id: Id19f095c506bab62a3be23a1cb0d1bf30369c54d
Dan Albert [Thu, 16 Oct 2014 18:10:15 +0000 (18:10 +0000)]
am
8a47f6d3: am
f2bdac77: Merge "Never use stlport on the host."
* commit '
8a47f6d3192140646d0d057c371b17e487fc2a77':
Never use stlport on the host.
Dan Albert [Thu, 16 Oct 2014 18:05:33 +0000 (18:05 +0000)]
am
f2bdac77: Merge "Never use stlport on the host."
* commit '
f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
Never use stlport on the host.
Dan Albert [Thu, 16 Oct 2014 18:01:45 +0000 (18:01 +0000)]
Merge "Never use stlport on the host."
Dirk Dougherty [Thu, 16 Oct 2014 17:28:52 +0000 (10:28 -0700)]
Doc change: update query params to force refresh of local js files.
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
Dan Albert [Thu, 16 Oct 2014 16:53:51 +0000 (09:53 -0700)]
Never use stlport on the host.
LOCAL_CXX_STL := stlport should just use the default STL on the host.
Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
smain@google.com [Thu, 16 Oct 2014 16:36:40 +0000 (16:36 +0000)]
am
f0d8234b: Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it\'s a bad A/B test because it does not save the A/B per session" into lmp-dev
* commit '
f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session
smain@google.com [Thu, 16 Oct 2014 16:32:37 +0000 (16:32 +0000)]
Merge "add helpouts banner thing to recruit providers includes script to randomly change the URL and text of link as an A/B test it's a bad A/B test because it does not save the A/B per session" into lmp-dev
Bernhard Rosenkraenzer [Wed, 1 Oct 2014 01:30:11 +0000 (03:30 +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 realpath and readlink where possible should work in all cases.
Change-Id: Ic60ac84a5b263dc1c1f2960092a7549d1024ed2e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Doug Zongker [Wed, 15 Oct 2014 23:59:03 +0000 (23:59 +0000)]
am
e18eb508: add support for the \'fill\' chunk type to sparse_img
* commit '
e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
Conley Owens [Wed, 15 Oct 2014 23:58:13 +0000 (23:58 +0000)]
am
c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
* commit '
c70ae578118573ec2073012ab57f0307184f74a3':
Docs: Replacing s.a.c. Android logo to match other sites.
Michael Runge [Wed, 15 Oct 2014 23:57:24 +0000 (23:57 +0000)]
am
9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
* commit '
9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
Fix public/private key options on sign_target_files_apks
smain@google.com [Wed, 15 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am
c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
* commit '
c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
hide the butter bar but also update the CSS for recent butterbar changes
Doug Zongker [Wed, 15 Oct 2014 22:55:50 +0000 (15:55 -0700)]
add support for the 'fill' chunk type to sparse_img
Bug:
17987996
Change-Id: Ia661e87877e52274a991ceb77bbed93b7e6218f2
(cherry picked from commit
629c7cc84d4880611718ab1812b9b9d1bf7ee6a0)
Ian Rogers [Wed, 15 Oct 2014 22:44:16 +0000 (15:44 -0700)]
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.
Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
Conley Owens [Wed, 15 Oct 2014 21:27:13 +0000 (21:27 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
smain@google.com [Fri, 3 Oct 2014 22:37:49 +0000 (15:37 -0700)]
add helpouts banner thing to recruit providers
includes script to randomly change the URL and text of link as an A/B test
it's a bad A/B test because it does not save the A/B per session
Change-Id: Ie8338a7403834d2322c5088039f2936207db734b
Michael Runge [Wed, 15 Oct 2014 19:54:21 +0000 (19:54 +0000)]
Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
smain@google.com [Wed, 15 Oct 2014 19:48:58 +0000 (12:48 -0700)]
hide the butter bar but also update the CSS for recent butterbar changes
Change-Id: I29cbdfe4ef6542a0dd04642be76856f3af2732d1
smain@google.com [Wed, 15 Oct 2014 19:17:43 +0000 (19:17 +0000)]
am
820e226d: am
d1ab4cb3: am
05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '
820e226d5dc63589dec0263d3639526addb5dbaa':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
smain@google.com [Wed, 15 Oct 2014 19:11:38 +0000 (19:11 +0000)]
am
d1ab4cb3: am
05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '
d1ab4cb3b4ca8de66a873abb072bd73556926d4d':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
Michael Runge [Wed, 15 Oct 2014 03:58:38 +0000 (20:58 -0700)]
Fix public/private key options on sign_target_files_apks
The if statements appear to check for public_signing
and then calls the private_signing function, and vice
versa.
Change-Id: I4511b9bcf0e03b9ba49b69eb80db84cf31d77020
smain@google.com [Wed, 15 Oct 2014 02:15:31 +0000 (02:15 +0000)]
am
05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '
05e55e9009435072ac25d2ce487d47b6c4f8a60b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
smain@google.com [Wed, 15 Oct 2014 02:08:50 +0000 (02:08 +0000)]
Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
smain@google.com [Wed, 15 Oct 2014 01:47:36 +0000 (18:47 -0700)]
add butterbar for L announcement.
make the butterbar an encapsulated method for inclusion multiple places.
Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
Dan Albert [Wed, 15 Oct 2014 00:19:06 +0000 (00:19 +0000)]
Merge "resolved conflicts for merge of
852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
Stuart Scott [Wed, 15 Oct 2014 00:18:37 +0000 (00:18 +0000)]
am
f06c6eff: Add abi to generated XML
* commit '
f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
Dan Albert [Wed, 15 Oct 2014 00:15:17 +0000 (17:15 -0700)]
resolved conflicts for merge of
852fc3e6 to lmp-dev-plus-aosp
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
Stuart Scott [Thu, 9 Oct 2014 02:01:37 +0000 (19:01 -0700)]
Add abi to generated XML
bug:
17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
Dan Albert [Wed, 15 Oct 2014 00:05:35 +0000 (00:05 +0000)]
am
c131ec09: Merge "Link compiler-rt in the correct order."
* commit '
c131ec09d9ffb92473c4162c92c0646d6e731b0c':
Link compiler-rt in the correct order.
Dan Albert [Tue, 14 Oct 2014 23:59:26 +0000 (23:59 +0000)]
Merge "Link compiler-rt in the correct order."
Dan Albert [Tue, 14 Oct 2014 17:45:33 +0000 (10:45 -0700)]
Link compiler-rt in the correct order.
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.
Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
Elliott Hughes [Mon, 13 Oct 2014 22:45:42 +0000 (22:45 +0000)]
am
33f33371: am
165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '
33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
Elliott Hughes [Mon, 13 Oct 2014 22:41:47 +0000 (22:41 +0000)]
am
165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '
165fdf42042d7c13d9f7866b3a3eff841e08dad2':
Remove "-mstackrealign" option from all x86 builds.
Elliott Hughes [Mon, 13 Oct 2014 22:35:58 +0000 (22:35 +0000)]
Merge "Remove "-mstackrealign" option from all x86 builds."
Alexander Ivchenko [Tue, 16 Sep 2014 12:30:41 +0000 (16:30 +0400)]
Remove "-mstackrealign" option from all x86 builds.
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/
Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
Alan Viverette [Fri, 10 Oct 2014 23:46:06 +0000 (23:46 +0000)]
am
4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
* commit '
4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
Alan Viverette [Fri, 10 Oct 2014 23:41:20 +0000 (23:41 +0000)]
Merge "Add Cutive Mono to makefiles" into lmp-dev
Alan Viverette [Fri, 10 Oct 2014 19:48:34 +0000 (12:48 -0700)]
Add Cutive Mono to makefiles
BUG:
17666124
Change-Id: I73aee6b7a211bfbd0bdba9c6c630c4c5dea905c7