Dan Albert
04eead7e2b
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
2014-10-23 14:04:02 -07:00
Chih-Hung Hsieh
ea503d21c7
Merge "Raise x86 arch requirement to prescott."
2014-10-23 20:47:30 +00:00
Jeff Davidson
b8ddd55b55
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
2014-10-23 07:20:16 -07:00
Neil Fuller
960f22c11d
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
2014-10-23 14:07:29 +01:00
Neil Fuller
4dfda1fa42
Merge "Remove Java 6 build support"
2014-10-23 09:00:15 +00:00
Bill Yi
4ac049b7ec
Restore AOSP-style version numbers - DO NOT MERGE
2014-10-22 15:44:51 -07:00
Chih-Hung Hsieh
c248fa3e01
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
2014-10-22 15:25:49 -07:00
Chih-Hung Hsieh
660f3c9ae9
Merge "Set default to Clang integrated assembler."
2014-10-22 21:07:47 +00:00
Chih-Hung Hsieh
57c8a15edd
Set default to Clang integrated assembler.
...
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
2014-10-22 09:21:53 -07:00
Bill Yi
13466f0f79
Merge commit '66b3e31936b99436e01c473dca492126eea3e336' into HEAD
2014-10-22 08:45:57 -07:00
Ying Wang
c6a12d776a
am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
...
* commit '46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 13:12:13 +00:00
Neil Fuller
46e00ea4ba
Remove Java 6 build support
...
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Ying Wang
46ba24c4a0
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
2014-10-22 01:37:16 +00:00
Ying Wang
85f24a406b
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
...
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:36:43 -07:00
Ying Wang
f3e4b2c98e
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.
2014-10-21 20:20:56 +00:00
Ying Wang
18cd02257d
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
2014-10-21 19:19:16 +00:00
Ying Wang
24e03369cf
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
2014-10-20 17:21:16 -07:00
Adam Lesinski
66b3e31936
am 318217a8: Enable building of gtest for Windows
...
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
2014-10-21 00:01:15 +00:00
Adam Lesinski
318217a84a
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
2014-10-20 16:06:44 -07:00
Dan Albert
96983cba42
am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."
...
* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
2014-10-20 22:42:11 +00:00
Dan Albert
cc0aa4dabd
am 28c265dd: Merge "We also need -rdynamic for host ASAN."
...
* commit '28c265ddddebeabc0597e976fbc817b70c46abc2':
We also need -rdynamic for host ASAN.
2014-10-20 22:36:45 +00:00
Dan Albert
28c265dddd
Merge "We also need -rdynamic for host ASAN."
2014-10-20 22:33:50 +00:00
Dan Albert
4ffe3f5b9f
We also need -rdynamic for host ASAN.
...
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
2014-10-20 13:54:27 -07:00
Dan Albert
66acb2a8ae
resolved conflicts for merge of 96c22133
to lmp-dev-plus-aosp
...
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
2014-10-20 13:37:18 -07:00
Dan Albert
96c22133af
am 1f134dd0: Merge "Add support for ASAN in host modules."
...
* commit '1f134dd06cd12f032c833b9a43b476a9557fa8da':
Add support for ASAN in host modules.
2014-10-20 20:28:43 +00:00
Dan Albert
1f134dd06c
Merge "Add support for ASAN in host modules."
2014-10-20 20:24:08 +00:00
Dan Albert
2daceaa83c
Add support for ASAN in host modules.
...
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
2014-10-20 11:37:18 -07:00
Stephen Hines
554e514c21
am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
...
* commit '7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
2014-10-20 18:30:08 +00:00
Stephen Hines
7d86749da7
am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
...
* commit 'ed8206dba48e182f786ec677d56586ffaf973250':
Remove unnecessary 10.8-specific build rules
2014-10-20 18:19:25 +00:00
Stephen Hines
ed8206dba4
Merge "Remove unnecessary 10.8-specific build rules"
2014-10-20 18:06:35 +00:00
Dan Albert
82f820e416
am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
...
* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
2014-10-18 02:42:07 +00:00
Dan Albert
ec28a489e8
am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
...
* commit '28c2d3b9852550bc9ae150e2725e08885f1ade73':
Fix breakage for x86_64 static executables.
2014-10-18 02:25:40 +00:00
Dan Albert
28c2d3b985
Merge "Fix breakage for x86_64 static executables."
2014-10-18 01:05:36 +00:00
Stephen Hines
781094fa43
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
2014-10-17 17:36:42 -07:00
Dan Albert
403ab71eba
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
2014-10-17 16:58:38 -07:00
Clay Murphy
11fac77937
am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
...
* commit '327180f5d2009be990076f152dffb244939b1673':
Docs: Fixing link, adding Android Partner logo.
2014-10-17 19:52:28 +00:00
Clay Murphy
327180f5d2
Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
2014-10-17 19:47:51 +00:00
Dan Albert
4eb496cc8d
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.
2014-10-17 17:53:07 +00:00
Dan Albert
fb77fe99b7
am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
...
* commit '26707ca8bb29b62252dd9d3d346f731f4fad2806':
Use libstc++ for the name of bionic's STL.
2014-10-17 17:48:24 +00:00
Dan Albert
26707ca8bb
Merge "Use libstc++ for the name of bionic's STL."
2014-10-17 17:44:36 +00:00
smain@google.com
eaad664b44
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
2014-10-17 17:00:47 +00:00
smain@google.com
be113f8ac0
fix broken download buttons, make a[name] offset apply only to reference docs
...
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
2014-10-17 09:56:10 -07:00
smain@google.com
e070d7820d
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
2014-10-17 08:33:52 +00:00
smain@google.com
947f3e9ecf
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
2014-10-17 08:27:18 +00:00
smain@google.com
77cf43e739
fix z-order of hangouts to avoid clobbering the search suggest
...
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
2014-10-17 01:21:13 -07:00
Ian Rogers
ed2783b8c6
am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:14 +00:00
Ian Rogers
0251f3454e
am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
...
* commit 'fc82be6e776acfc3d784e61e2026d65417285495':
Add LPAE to dex2oat ISA feature list.
2014-10-17 07:34:45 +00:00
Joe Fernandez
6b607ce33d
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.
2014-10-17 05:50:19 +00:00
Joe Fernandez
e321df0ca2
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
2014-10-17 05:41:07 +00:00
smain@google.com
c5b105a3a8
Merge "fix scroll offset when loading non-header pages" into lmp-dev
...
automerge: 19c6780
* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
2014-10-17 05:34:36 +00:00