Commit Graph

860 Commits

Author SHA1 Message Date
Colin Cross
50d1f282c6 Support sanitizer variants inside make builds am: bc6fb16b26 am: 991008ce19
am: 390f076154

* commit '390f0761548a8492233c733e93773c9f92eb7f1a':
  Support sanitizer variants inside make builds

Change-Id: Ia5462a100077f008d4f23e84827fee0881eea3c8
2016-05-25 19:37:53 +00:00
Colin Cross
b36ab1a1a0 Fix sanitize host builds
Host builds don't have a separate place to install asan modules, so only
create a single variant for them.

Change-Id: I81f7090debd7935db778f8600d8cbc86dd53b1cb
2016-05-25 12:35:53 -07:00
Colin Cross
390f076154 Support sanitizer variants inside make builds am: bc6fb16b26
am: 991008ce19

* commit '991008ce19f63117f72553d8d46f21304342d8f9':
  Support sanitizer variants inside make builds

Change-Id: I646ce88d295f8090602860fe514fcd71debe4601
2016-05-25 19:33:13 +00:00
Colin Cross
991008ce19 Support sanitizer variants inside make builds
am: bc6fb16b26

* commit 'bc6fb16b26dedee0e9f10239cb9a6c8a3e647b04':
  Support sanitizer variants inside make builds

Change-Id: I5c75ac2dcc8a11eba3155e0d1d382edb176e8de7
2016-05-25 19:29:07 +00:00
Colin Cross
bc6fb16b26 Support sanitizer variants inside make builds
Create both sanitized and unsanitized variants inside make builds with
sanitizers enabled.  Only export the sanitized version to make, and
always install the sanitized version in /data to match the make build.

Change-Id: I5a17bcbddc7a9d871c929c84d3c116228ef3258f
2016-05-24 17:14:15 -07:00
Dan Willemsen
7dca6945ce Stop sorting (C|CPP|LD)FLAGS when checking am: 9598e1048a am: a897cbfd33
am: d6e7df3545

* commit 'd6e7df354584dcc95961498b7a279dd6330203df':
  Stop sorting (C|CPP|LD)FLAGS when checking

Change-Id: I1cf98161a71394537c0dce78e76175d3851f6b5e
2016-05-24 01:14:30 +00:00
Dan Willemsen
d21dcb7477 Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS am: e8c5237775 am: c99fc3d097
am: f1a1389e65

* commit 'f1a1389e65bd8dc0e76080ab0b3c78e4a142f0e2':
  Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS

Change-Id: I7b582fde7082c89b1b2a42121b4c6c6c24f98b58
2016-05-24 01:14:29 +00:00
Dan Willemsen
d6e7df3545 Stop sorting (C|CPP|LD)FLAGS when checking am: 9598e1048a
am: a897cbfd33

* commit 'a897cbfd3399cd93bf2bb87a8aa6cef5bcd2a750':
  Stop sorting (C|CPP|LD)FLAGS when checking

Change-Id: I9f5f85edcfb5708d9b375e3e6fa4a46bf369bf15
2016-05-24 01:11:41 +00:00
Dan Willemsen
f1a1389e65 Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS am: e8c5237775
am: c99fc3d097

* commit 'c99fc3d097eb72e4045d935bbd2997ce39d928df':
  Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS

Change-Id: I1085f05f212c9165e5026efe9886d4a152a0ea45
2016-05-24 01:11:41 +00:00
Dan Willemsen
a897cbfd33 Stop sorting (C|CPP|LD)FLAGS when checking
am: 9598e1048a

* commit '9598e1048a890810fc35b9655ee603a6994e8665':
  Stop sorting (C|CPP|LD)FLAGS when checking

Change-Id: I04fc04fb2d019777d68c26262c6636fb6b18d806
2016-05-24 01:09:14 +00:00
Dan Willemsen
c99fc3d097 Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS
am: e8c5237775

* commit 'e8c5237775f413bbb56084e19054a3d979e15985':
  Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS

Change-Id: I3725569bc11883534d4a41035d91a9599200a756
2016-05-24 01:09:13 +00:00
Dan Willemsen
9598e1048a Stop sorting (C|CPP|LD)FLAGS when checking
Make isn't defining these anymore, so we don't need to sort them before
comparing.

Change-Id: Ia2f13f665309569ee8c564a8fb82639d174a83bb
2016-05-23 15:15:13 -07:00
Dan Willemsen
035a9a3107 Check more Make variables am: 558e517ae9 am: e9b7ce1d10
am: 637583fc52

* commit '637583fc5271116cfc12ad8bab709f5aea8d8f9b':
  Check more Make variables

Change-Id: I60775a6c8046925412789e6f1a5a42ddf5093d11
2016-05-23 19:37:21 +00:00
Dan Willemsen
637583fc52 Check more Make variables am: 558e517ae9
am: e9b7ce1d10

* commit 'e9b7ce1d10210ddd79e060f182c38f9699508dc1':
  Check more Make variables

Change-Id: Iaf0c1e05c7c4bf00ff94b80a5cc526af70e1da71
2016-05-23 19:34:37 +00:00
Dan Willemsen
e9b7ce1d10 Check more Make variables
am: 558e517ae9

* commit '558e517ae99d018305a45da6f46ee2a53f47c928':
  Check more Make variables

Change-Id: I6d661d3815302209bf158feaa9f1bb1094b10e12
2016-05-23 19:31:30 +00:00
Dan Willemsen
e8c5237775 Fix and check CLANG_CONFIG_UNKNOWN_CFLAGS
Change-Id: Id8d4ab5e7bf7c9ed161596c19ccdfe00aaa2f7c6
2016-05-20 00:19:14 -07:00
Dan Willemsen
558e517ae9 Check more Make variables
Some more common makevars methods were required in order to remove the
"-isystem" prefixes from the toolchain.IncludeFlags() value. In Make,
the -isystem is prepended at time of use, not in TARGET_C_INCLUDES
itself.

Change-Id: If07e69ddb7357d11c7dd48ab60f503d219f29de8
2016-05-20 00:19:14 -07:00
Colin Cross
b1cdcb8759 Add libclang_rt.asan-mips[64]-android.so am: d87145fe05 am: 9deacc3cc5
am: 23175b8661

* commit '23175b86612fdb3884db2d5ca77ee725a0d70ea3':
  Add libclang_rt.asan-mips[64]-android.so

Change-Id: Ieb863e3103d43401b543f6c4bc635b63c99f7877
2016-05-20 07:13:18 +00:00
Colin Cross
23175b8661 Add libclang_rt.asan-mips[64]-android.so am: d87145fe05
am: 9deacc3cc5

* commit '9deacc3cc5b74204e9fe100fbbe84fcb7dbab3a1':
  Add libclang_rt.asan-mips[64]-android.so

Change-Id: I0ff10e53f87367fd16f43a4ed45609ebfc302fef
2016-05-20 07:10:38 +00:00
Colin Cross
9deacc3cc5 Add libclang_rt.asan-mips[64]-android.so
am: d87145fe05

* commit 'd87145fe0560f8a5f6a1b5d0e90c8dde30ee66cb':
  Add libclang_rt.asan-mips[64]-android.so

Change-Id: I840e3608be5e561c1c8b61b9fccd384b1704851d
2016-05-20 07:07:47 +00:00
Colin Cross
d87145fe05 Add libclang_rt.asan-mips[64]-android.so
Add the clang asan runtime libraries to the mips and mips64 toolchain
definitions.  Fixes missing symbol build errors on asan_test.

Change-Id: I10c46599af2c7758f4726814920b8881644c6f97
2016-05-19 22:43:46 -07:00
Dan Willemsen
39317638f6 Fix makevars (C|LD)FLAGS ordering am: d26a713dca am: 1866cb4290
am: 9139e19dfd

* commit '9139e19dfdbb9609e3bb42f1b9bfec15fc681283':
  Fix makevars (C|LD)FLAGS ordering

Change-Id: Id057b36012ad9b8b6f35853ff5bc9ae4219463f0
2016-05-19 18:44:10 +00:00
Dan Willemsen
8936b5ff17 Move -msoft-float to ToolchainCflags am: c264c16638 am: 2c979349fa
am: 14776e92f0

* commit '14776e92f03d0683fef0559f838ddd2c98e784bd':
  Move -msoft-float to ToolchainCflags

Change-Id: I977b4e29c58949676709f38954959512f016f4b4
2016-05-19 18:44:09 +00:00
Dan Willemsen
9139e19dfd Fix makevars (C|LD)FLAGS ordering am: d26a713dca
am: 1866cb4290

* commit '1866cb4290ccf564abac8755961156a11c0dd5e1':
  Fix makevars (C|LD)FLAGS ordering

Change-Id: Ief4d0886f4dc9224f35842e6361f967aae39cfea
2016-05-19 18:36:36 +00:00
Dan Willemsen
14776e92f0 Move -msoft-float to ToolchainCflags am: c264c16638
am: 2c979349fa

* commit '2c979349fa9b3d9278e609bc11072a097b5610fe':
  Move -msoft-float to ToolchainCflags

Change-Id: I97dec7384b056ce6b7591c29d54017d29953fd34
2016-05-19 18:36:36 +00:00
Dan Willemsen
1866cb4290 Fix makevars (C|LD)FLAGS ordering
am: d26a713dca

* commit 'd26a713dcac8a2fa750d69751d29bfdfa8fd7717':
  Fix makevars (C|LD)FLAGS ordering

Change-Id: I1e36de7843dd207f444fca0d9aa2c7dd950100dd
2016-05-19 18:34:03 +00:00
Dan Willemsen
2c979349fa Move -msoft-float to ToolchainCflags
am: c264c16638

* commit 'c264c16638aa51caacd1b0d203a536b8b35491c0':
  Move -msoft-float to ToolchainCflags

Change-Id: I363fd9989a2c5223c87b48df2189d31cfbbd9fa3
2016-05-19 18:34:01 +00:00
Dan Willemsen
d26a713dca Fix makevars (C|LD)FLAGS ordering
This better matches the order from cc/cc.go, so that any implicit
ordering behaves the same in Make and Soong.

Change-Id: I802d725f037a22c4b2f0ae28258af95efa37ce79
2016-05-18 23:00:57 -07:00
Dan Willemsen
c264c16638 Move -msoft-float to ToolchainCflags
-msoft-float is equivalent to -mfloat-abi=soft, which means we need to
make sure the order is correct if we also specify -mfloat-abi=softfp.
Since the Neon support (with -mfloat-abi=softfp) is in the cpu-specific
ToolchainCflags, move the generic definition into ToolchainCflags as
well.

This wasn't actually causing problems when compiling, since the normal
toolchain.Cflags is before toolchain.ToolchainCflags, but the makevars
code accidentally reversed this. That will be fixed as well, but this
will protect against similar problems in the future.

Change-Id: If6f37c845210105f84769bab45fde5d7fdc2fe09
2016-05-18 22:52:25 -07:00
Dan Willemsen
b0e7b1f5a2 Add windows prebuilt library path am: 03a7086319 am: 8cb947eb7e
am: 1d7f125497

* commit '1d7f12549735d6febd42bac0980f84c5071c629c':
  Add windows prebuilt library path

Change-Id: If2945f72aae858e41bdb6d566126c0a7261a6aa1
2016-05-19 01:29:12 +00:00
Dan Willemsen
eb07fa288f Support Windows IncludeFlags am: d352edf0e8 am: c7dac05abc
am: 5c13a4b7b6

* commit '5c13a4b7b6f9cc6910b930a953726e0428be079e':
  Support Windows IncludeFlags

Change-Id: Iebe4f1b96d0407d270bb8037d8223f7a4177f8cb
2016-05-19 01:29:12 +00:00
Dan Willemsen
3ccdb9abf0 Add the common directory back to kernel headers. am: a2abfd6b30 am: 32b3e00b7e
am: 7f14652efe

* commit '7f14652efe11e0a2dabe022b31494e3bd0c1796c':
  Add the common directory back to kernel headers.

Change-Id: I98d01f3473634f9c1c2d0fb04b275fecab5600c6
2016-05-19 01:29:11 +00:00
Dan Willemsen
1d7f125497 Add windows prebuilt library path am: 03a7086319
am: 8cb947eb7e

* commit '8cb947eb7e16079dcb100e57125a1d0b85e6d387':
  Add windows prebuilt library path

Change-Id: I192dcd454d24f2fd76bbbd4e959b68f37ce40fe5
2016-05-19 01:26:20 +00:00
Dan Willemsen
5c13a4b7b6 Support Windows IncludeFlags am: d352edf0e8
am: c7dac05abc

* commit 'c7dac05abce912136b966cf3e03ca738800f768b':
  Support Windows IncludeFlags

Change-Id: I27bd3db9a35b9aac8dfa0410460eaed1df9db046
2016-05-19 01:26:20 +00:00
Dan Willemsen
7f14652efe Add the common directory back to kernel headers. am: a2abfd6b30
am: 32b3e00b7e

* commit '32b3e00b7e7c1a5e2a442fb1fb7b204598f57603':
  Add the common directory back to kernel headers.

Change-Id: Ia9669067a7e63d459977b1d65f39217b900defc7
2016-05-19 01:26:20 +00:00
Dan Willemsen
8cb947eb7e Add windows prebuilt library path
am: 03a7086319

* commit '03a708631919145f403a89352e36785eded6c73c':
  Add windows prebuilt library path

Change-Id: I2f487ef05b58440789ba177c640ec1aab02d9df9
2016-05-19 01:23:39 +00:00
Dan Willemsen
c7dac05abc Support Windows IncludeFlags
am: d352edf0e8

* commit 'd352edf0e8c5f838d5d2ae853b673535530e0742':
  Support Windows IncludeFlags

Change-Id: I9225287a193fcffe128cb5e5c457eb662beb71ae
2016-05-19 01:23:38 +00:00
Dan Willemsen
32b3e00b7e Add the common directory back to kernel headers.
am: a2abfd6b30

* commit 'a2abfd6b30e80bf39bcc22b4fee91db37f14fa4a':
  Add the common directory back to kernel headers.

Change-Id: Id6f2fff3a1d99b03c59916009122bec1b52dcf9c
2016-05-19 01:23:36 +00:00
Colin Cross
a2c2dbefac Rename common to android am: 635c3b0157 am: ba47854c4a
am: fcecbef5f3

* commit 'fcecbef5f3601f619130367590e01e2a903a834a':
  Rename common to android

Change-Id: I0b54a5a36f41b7edffa1532198b91a35c45e2681
2016-05-18 23:54:50 +00:00
Colin Cross
fcecbef5f3 Rename common to android am: 635c3b0157
am: ba47854c4a

* commit 'ba47854c4a7fe0f7bd246fe3e976543ea2aab13f':
  Rename common to android

Change-Id: I2549b7452aea32b9942b976b1bea6e92946fac3b
2016-05-18 23:51:32 +00:00
Dan Willemsen
03a7086319 Add windows prebuilt library path
This was in HOST_CROSS_GLOBAL_LD_DIRS, which is why it didn't get
translated over here, since Soong does not use global linking
directories. It's being moved to HOST_CROSS_GLOBAL_LDFLAGS so that it
can be shared.

Change-Id: Ie20670278a589ae3cf76e09de4079edfa800cf5b
2016-05-18 16:51:24 -07:00
Dan Willemsen
d352edf0e8 Support Windows IncludeFlags
The variable was defined, but it wasn't being exposed to the Toolchain
interface. It was also using -I instead of -isystem.

Change-Id: Iee9862a4b9c50c9497915175a23864b4b2c29c26
2016-05-18 16:51:24 -07:00
Dan Willemsen
a2abfd6b30 Add the common directory back to kernel headers.
This is a port of build/ change 6a2f28514.

Change-Id: I9128abf61a56e282f335f540fcf064dd52706b2b
2016-05-18 16:51:24 -07:00
Colin Cross
ba47854c4a Rename common to android
am: 635c3b0157

* commit '635c3b0157f38c06833e5e789d0137f99844c0b6':
  Rename common to android

Change-Id: I7fb6657c571dbc2e77c160cd025cb246f7cf2b08
2016-05-18 23:48:50 +00:00
Colin Cross
67f918cefc Fix ndk x86_64 and mips64 builds am: c7fd91a266 am: 24280d5a63
am: 424b5d26aa

* commit '424b5d26aa53ed0568428b63ddfc83138e61aa53':
  Fix ndk x86_64 and mips64 builds

Change-Id: Iea032fc5ce1f99fdc9fbf3fa9308eb3e53f792e8
2016-05-18 22:59:57 +00:00
Colin Cross
424b5d26aa Fix ndk x86_64 and mips64 builds am: c7fd91a266
am: 24280d5a63

* commit '24280d5a6318eb4fc6449b5e73c1f32e226f4bee':
  Fix ndk x86_64 and mips64 builds

Change-Id: If75d30592e0013b9ae40fc36164c6e1a40ea2f3d
2016-05-18 22:53:31 +00:00
Colin Cross
24280d5a63 Fix ndk x86_64 and mips64 builds
am: c7fd91a266

* commit 'c7fd91a2660c7e0af1ccea0d662e0804998769ee':
  Fix ndk x86_64 and mips64 builds

Change-Id: I03db57ffabde18f8345aa7d4d9cc1d351ae63faf
2016-05-18 22:48:08 +00:00
Colin Cross
635c3b0157 Rename common to android
Rename the "common" package to "android", because common is too
generic.  Also removes all android.Android naming stutter.

Ran:
gomvpkg -from 'android/soong/common' -to 'android/soong/android'
gorename -from '"android/soong/android".AndroidModuleContext' -to 'ModuleContext'
gorename -from '"android/soong/android".AndroidBaseContext' -to 'BaseContext'
gorename -from '"android/soong/android".AndroidModuleBase' -to 'ModuleBase'
gorename -from '"android/soong/android".AndroidBottomUpMutatorContext' -to 'BottomUpMutatorContext'
gorename -from '"android/soong/android".AndroidTopDownMutatorContext' -to 'TopDownMutatorContext'
gorename -from '"android/soong/android".AndroidModule' -to 'Module'

Change-Id: I3b23590b8ce7c8a1ea1139411d84a53163288da7
2016-05-18 15:37:25 -07:00
Colin Cross
c7fd91a266 Fix ndk x86_64 and mips64 builds
x86_64 and mips64 NDK prebuilt libraries are stored in .../usr/lib64,
but arm64 and all the 32-bit ABIs use .../usr/lib.  Add a 64 suffix to
the path for all 64-bit ABIs except arm64.

Change-Id: I98e87ff6a7f1aa75adbeb37c5b1e7208b953322f
2016-05-18 22:24:19 +00:00
Dan Willemsen
8923aea025 Fix Static_executable, implement BUILD_HOST_static from Make am: 36cff8bb6f am: 3429da5c70
am: 0a87789639

* commit '0a877896390e9417589d89445b4a8e938d7bb346':
  Fix Static_executable, implement BUILD_HOST_static from Make

Change-Id: Iae85510acdc918f2dcd3b229aff0fc57386a6476
2016-05-18 00:45:52 +00:00