openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
20,140 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

5721 Commits

Author SHA1 Message Date
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
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 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
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
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
Dan Albert 93e8cf71fc 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
 2014-10-16 21:18:15 -07:00
Ian Rogers fc82be6e77 Merge "Add LPAE to dex2oat ISA feature list." 2014-10-17 03:56:42 +00:00
Ying Wang 19f43c18f6 am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions" 
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
  Fix Java detection on some Linux distributions
 2014-10-16 21:09:06 +00:00
Ying Wang b3f42ed09a am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions" 
* commit '4e3e9ffbf314500d303724aefbddf1b89094cfd8':
  Fix Java detection on some Linux distributions
 2014-10-16 21:03:04 +00:00
Ying Wang 4e3e9ffbf3 Merge "Fix Java detection on some Linux distributions" 2014-10-16 20:58:37 +00:00
Ian Rogers 1bd593ca0b 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.
 2014-10-16 20:13:05 +00:00
Ian Rogers defe864ab6 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.
 2014-10-16 20:07:27 +00:00
Ian Rogers 6825e3c9db Add LPAE to dex2oat ISA feature list. 
Bug: 17993736

Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
 2014-10-16 13:07:05 -07:00
Ian Rogers 07b212ac59 Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level." 2014-10-16 20:02:26 +00:00
Dan Albert ad1891d1e9 am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host." 
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
  Never use stlport on the host.
 2014-10-16 18:10:15 +00:00
Dan Albert 8a47f6d319 am f2bdac77: Merge "Never use stlport on the host." 
* commit 'f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
  Never use stlport on the host.
 2014-10-16 18:05:33 +00:00
Dan Albert b49987e2f8 Never use stlport on the host. 
LOCAL_CXX_STL := stlport should just use the default STL on the host.

Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
 2014-10-16 09:53:51 -07:00
Bernhard Rosenkraenzer 311384fec3 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>
 2014-10-16 14:08:32 +02:00
Ian Rogers 63e551f0ae 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
 2014-10-15 15:44:16 -07:00
Dan Albert b0d324aadd Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-10-15 00:19:06 +00:00
Stuart Scott 3e65583ef7 am f06c6eff: Add abi to generated XML 
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
  Add abi to generated XML
 2014-10-15 00:18:37 +00:00
Dan Albert ae66eba6f3 resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp 
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
 2014-10-14 17:15:17 -07:00
Stuart Scott f06c6eff65 Add abi to generated XML 
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
 2014-10-15 00:10:08 +00:00
Dan Albert 852fc3e69c am c131ec09: Merge "Link compiler-rt in the correct order." 
* commit 'c131ec09d9ffb92473c4162c92c0646d6e731b0c':
  Link compiler-rt in the correct order.
 2014-10-15 00:05:35 +00:00
Dan Albert e1b17e7ef5 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
 2014-10-14 10:45:33 -07:00
Elliott Hughes 337dd2e637 am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds." 
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
  Remove "-mstackrealign" option from all x86 builds.
 2014-10-13 22:45:42 +00:00
Elliott Hughes 33f33371cd am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds." 
* commit '165fdf42042d7c13d9f7866b3a3eff841e08dad2':
  Remove "-mstackrealign" option from all x86 builds.
 2014-10-13 22:41:47 +00:00