Commit Graph

1786 Commits

Author SHA1 Message Date
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
Dan Willemsen
0a87789639 Fix Static_executable, implement BUILD_HOST_static from Make am: 36cff8bb6f
am: 3429da5c70

* commit '3429da5c704d43e98875b09616297643a7e86010':
  Fix Static_executable, implement BUILD_HOST_static from Make

Change-Id: I61460047b95390775ad083fb9427191a3462db5e
2016-05-18 00:43:20 +00:00
Dan Willemsen
3429da5c70 Fix Static_executable, implement BUILD_HOST_static from Make
am: 36cff8bb6f

* commit '36cff8bb6fdff4a843dfe65cc83227b7f677dd55':
  Fix Static_executable, implement BUILD_HOST_static from Make

Change-Id: I6a8eacdb7bd5ef03659207d4529f557aec51de34
2016-05-18 00:40:49 +00:00
Dan Willemsen
36cff8bb6f Fix Static_executable, implement BUILD_HOST_static from Make
Static_executable was still using ModifyProperties, and was otherwise
missing things. Fix all of that up, and implement HostStaticBinaries,
which is the equivalent of BUILD_HOST_static in Make. That will default
host binaries to be static, which is useful for building SDK tools to
run with incompatible C libraries.

Change-Id: I2a62181b5d854b310edc8ae7a6bcbd30b89e7463
2016-05-17 16:39:17 -07:00
Dan Willemsen
71990fae5b Export CONLYFLAGS and CPPFLAGS to Make am: 216a459ccc am: 53ad362d24
am: a2190784e0

* commit 'a2190784e0e4d7cebee7d571053054384ff12cb1':
  Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: I9b4d5591b9afd43c1e5ab04949d3b7d1bba6f3dc
2016-05-17 19:58:13 +00:00
Dan Willemsen
a2190784e0 Export CONLYFLAGS and CPPFLAGS to Make am: 216a459ccc
am: 53ad362d24

* commit '53ad362d249e0407df457adf058b8f08ffdb9af8':
  Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: Ic84f5b8864ae1cdbd8f2f7d270f0219fcac4dc0e
2016-05-17 19:55:06 +00:00
Dan Willemsen
53ad362d24 Export CONLYFLAGS and CPPFLAGS to Make
am: 216a459ccc

* commit '216a459ccc782d9b47e5663b4c3b81f0e03e2739':
  Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: Ie8286de619a2a8b369376660613ed8e476389fca
2016-05-17 19:51:44 +00:00
Dan Willemsen
216a459ccc Export CONLYFLAGS and CPPFLAGS to Make
Change-Id: I061d531983b5bb544efb2f0ab5912cd2b461f58b
2016-05-17 01:00:50 -07:00
Dan Willemsen
3b4aae8a23 Export -D__BRILLO__ to make if necessary am: 06f453359a am: da8b053323
am: 224361ead4

* commit '224361ead4ff8a831eb1df781d4a39093f4e40aa':
  Export -D__BRILLO__ to make if necessary

Change-Id: Ie77dc5ee2480c25f0ed9deb13a09db996e6830a2
2016-05-17 02:45:45 +00:00
Dan Willemsen
224361ead4 Export -D__BRILLO__ to make if necessary am: 06f453359a
am: da8b053323

* commit 'da8b0533239d35ea5e82d11624c4c7820bbf66e0':
  Export -D__BRILLO__ to make if necessary

Change-Id: Iaeb3018c7f8666037d596b4f0917686a435b43fb
2016-05-17 02:43:32 +00:00
Dan Willemsen
da8b053323 Export -D__BRILLO__ to make if necessary
am: 06f453359a

* commit '06f453359a6686e20d00e7ab661e39ce0e0e5bb5':
  Export -D__BRILLO__ to make if necessary

Change-Id: I0b5236fe6a32c52e00e50d88b99928a1ad4ef6ad
2016-05-17 02:41:00 +00:00
Dan Willemsen
06f453359a Export -D__BRILLO__ to make if necessary
Fixes Brillo builds

Change-Id: Ia3563b0c9e000d95ed18d05460f5c8c32e04e191
2016-05-16 19:32:33 -07:00
Dan Willemsen
44cc025401 Turn on strict checking for C[PP]FLAGS make vars am: b436fdee65 am: fb2eaaf8f2
am: a5f997fa39

* commit 'a5f997fa39fe56de414e773b0ebee287571d83b6':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: I1380124d2533e687bed4429d08932ea7464e3f74
2016-05-17 02:11:12 +00:00
Dan Willemsen
5e9acd18c2 Don\'t use -B...gcc.. on Darwin am: 3772da13fd am: aaaeb15c73
am: fc8fa79a7f

* commit 'fc8fa79a7f44548f01fd48bc710d4cc3795f9953':
  Don't use -B...gcc.. on Darwin

Change-Id: Id7a487d43b9d54e10f31f4ce3e8b2ee490321c44
2016-05-17 02:11:12 +00:00
Dan Willemsen
a5f997fa39 Turn on strict checking for C[PP]FLAGS make vars am: b436fdee65
am: fb2eaaf8f2

* commit 'fb2eaaf8f2cf111cf76937bd10e2cf6d5901f122':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: I6467f06c78886700089203f829ad30ede6a222af
2016-05-17 02:08:21 +00:00
Dan Willemsen
fc8fa79a7f Don\'t use -B...gcc.. on Darwin am: 3772da13fd
am: aaaeb15c73

* commit 'aaaeb15c7396f5454ab72a37f190ab5b9003e13b':
  Don't use -B...gcc.. on Darwin

Change-Id: I150c7aa6df8fcc895d4b5cf21f9e90e5c1b1b1f4
2016-05-17 02:08:20 +00:00
Dan Willemsen
fb2eaaf8f2 Turn on strict checking for C[PP]FLAGS make vars
am: b436fdee65

* commit 'b436fdee65b2ae27576b37f1f13a324bc9c7f51a':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: If75cd0402c85326307ef6d1657c3f8153f904a38
2016-05-17 02:05:51 +00:00
Dan Willemsen
aaaeb15c73 Don\'t use -B...gcc.. on Darwin
am: 3772da13fd

* commit '3772da13fd9b4d1f0aec35c73883c1cb5b60fd35':
  Don't use -B...gcc.. on Darwin

Change-Id: Iad450b34cc85054b573ec0c2b8537414def9ef52
2016-05-17 02:05:50 +00:00
Dan Willemsen
b436fdee65 Turn on strict checking for C[PP]FLAGS make vars
Change-Id: I8448feb55b54515856798c1b3e8070d0e07e0b6c
2016-05-16 18:04:45 -07:00
Dan Willemsen
3772da13fd Don't use -B...gcc.. on Darwin
We don't ship binutils on Darwin, so there is no point in telling clang
to look in that path. (The path being used doesn't even exist). This
matches the Make behavior.

Change-Id: I663047057ff8df8a349483532da8018af13d50d8
2016-05-16 18:04:01 -07:00
Colin Cross
ca13185875 Merge "Include bionic/Android.bp" am: 88c4750c51 am: 1004805108
am: 2729765903

* commit '27297659037a15ef5cbc2cb5eaa7588323d9162f':
  Include bionic/Android.bp

Change-Id: I7a8e808170daac52847e620e60235262f636d799
2016-05-17 01:02:08 +00:00
Colin Cross
2729765903 Merge "Include bionic/Android.bp" am: 88c4750c51
am: 1004805108

* commit '100480510886bfc5989e63324745f837cf9d4341':
  Include bionic/Android.bp

Change-Id: Icb1f4b6041e78ef0ef6a261934457ea50e16060a
2016-05-17 00:55:53 +00:00
Colin Cross
1004805108 Merge "Include bionic/Android.bp"
am: 88c4750c51

* commit '88c4750c518f3910725f74295d21286291551f5d':
  Include bionic/Android.bp

Change-Id: Id61be2e4e7e5f92747e67bccceae741dcd99336f
2016-05-17 00:52:30 +00:00
Colin Cross
88c4750c51 Merge "Include bionic/Android.bp" 2016-05-17 00:42:17 +00:00
Dan Willemsen
53c30c05df Merge changes I7fd53084,I6b7a3062 am: 8911062843 am: 9c1c2f7fb8
am: 8f6f30e559

* commit '8f6f30e55953c576cb4edfcce50cf1c77eed71a1':
  Properly export toolchain static libs
  Add more make-exported variables

Change-Id: Ic4ac5ce44b1ae5b2e87ea5434577bcba37438579
2016-05-16 23:57:03 +00:00