StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,907 Commits 1 Branch 0 Tags
dead54fc06c397b51d624eaf0a5f18f0205b91a0
Commit Graph

6592 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
Neil Fuller
46e00ea4ba Remove Java 6 build support 
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
 2014-10-22 10:53:59 +01: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
03eceba1dd Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it. 
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
 2014-10-21 18:34:30 -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
Adam Lesinski
d663a5a2c7 am c8f15f4b: am ea24f794: am 318217a8: Enable building of gtest for Windows 
* commit 'c8f15f4b81137ac16d690fd5e420d8f25e5cdd85':
  Enable building of gtest for Windows
 2014-10-21 16:59:19 +00:00
Adam Lesinski
c8f15f4b81 am ea24f794: am 318217a8: Enable building of gtest for Windows 
* commit 'ea24f7947969a874cd4039e66af116ae655ea140':
  Enable building of gtest for Windows
 2014-10-21 16:53:47 +00:00
Adam Lesinski
ea24f79479 am 318217a8: Enable building of gtest for Windows 
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
  Enable building of gtest for Windows
 2014-10-21 16:40:56 +00:00
Ying Wang
298baafdaa am 89897723: resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp 
* commit '89897723ea6f197168c8aa4a58b5aa1b4ba635e1':
  core: OSX: Support 10.9 SDK as well
 2014-10-21 00:58:08 +00:00
Ying Wang
89897723ea resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp 
Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
 2014-10-20 17:51:50 -07:00
Naseer Ahmed
3a2b9f0a49 core: OSX: Support 10.9 SDK as well 
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
 2014-10-20 17:34:49 -07: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
d385a64f4f am 94d42140: am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN." 
* commit '94d4214094552d8f6853ef9168b3e44174fdd753':
  We also need -rdynamic for host ASAN.
 2014-10-20 22:48:12 +00:00
Dan Albert
94d4214094 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:23 +00: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
e959b89247 am 71629967: resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp 
* commit '7162996734fbd2b3c0aaf63db842f2fc48bc95bb':
  Add support for ASAN in host modules.
 2014-10-20 20:47:39 +00:00
Dan Albert
7162996734 resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp 
Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34
 2014-10-20 13:38:43 -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
8ed26c3e98 am 52b4d2f0: am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules" 
* commit '52b4d2f0964feea351e931a32a0671424dc00583':
  Remove unnecessary 10.8-specific build rules
 2014-10-20 18:35:52 +00:00
Stephen Hines
52b4d2f096 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:27 +00: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
Ying Wang
3c9ea190d3 Merge "Allow to build libcore in PDK build." 2014-10-19 00:17:02 +00:00
Dan Albert
934af716ac am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables." 
automerge: ecc5e32

* commit 'ecc5e3218aeeeed423ec226c5c87c42e62ec931c':
  Fix breakage for x86_64 static executables.
 2014-10-18 03:31:06 +00:00
Dan Albert
ecc5e3218a 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: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
Ying Wang
2fee3a8659 Allow to build libcore in PDK build. 
Change-Id: Ice40f19dd3302378daa9bd4c4ecd2c1d2c7ff284
 2014-10-17 18:26:39 -07: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
79dac8791d am ec807a8c: am fb77fe99: am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL." 
* commit 'ec807a8cc10bf9d5f9aa5c6ecc0a0c980b673364':
  Use libstc++ for the name of bionic's STL.
 2014-10-17 17:57:52 +00:00
Dan Albert
ec807a8cc1 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:11 +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
Dianne Hackborn
2799aacd62 am 87fa865b: am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev 
* commit '87fa865bea0140b49b5f46e20c64d252e8b91adf':
  Move up to API 21, Lollipop MR1.
 2014-10-17 17:25:41 +00:00
Dianne Hackborn
87fa865bea am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev 
* commit '374712c54f5416e14523eec15456bb8b4372ffac':
  Move up to API 21, Lollipop MR1.
 2014-10-17 17:19:57 +00:00
Dianne Hackborn
4a6a7524b3 Move up to API 21, Lollipop MR1. 
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
 2014-10-17 10:05:33 -07:00
Ian Rogers
1875298a96 am 7e771594: am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list." 
* commit '7e771594ce62b3d869e90831a24fa5a8956525cc':
  Add LPAE to dex2oat ISA feature list.
 2014-10-17 07:48:47 +00:00