Elliott Hughes
f04f391b5f
am 4548e7f4
: Merge "Remove AndroidConfig.h."
...
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
Remove AndroidConfig.h.
2015-08-28 19:59:18 +00:00
Elliott Hughes
43146118aa
Remove AndroidConfig.h.
...
This change leaves soong references.
Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
2015-08-28 10:31:28 -07:00
Elliott Hughes
dc289ce17c
am 344c3394
: am 6f534125
: Merge "Fix Linux host checkbuilds."
...
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
Fix Linux host checkbuilds.
2015-08-21 00:11:53 +00:00
Elliott Hughes
6f5341259c
Merge "Fix Linux host checkbuilds."
2015-08-20 23:56:07 +00:00
Elliott Hughes
ac9eea9463
Fix Linux host checkbuilds.
...
Turns out that thanks to 9d59f41776
we actually
build *all* the host libraries both 32- and 64-bit. Rather than fix the
libraries (or fixing things so we don't build stuff we don't need) right now,
let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back.
Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd
2015-08-20 16:52:47 -07:00
Elliott Hughes
158800c9ed
am 30a18bca
: am a3fa59b1
: Merge "Kill host Linux AndroidConfig.h."
...
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
Kill host Linux AndroidConfig.h.
2015-08-20 23:20:21 +00:00
Elliott Hughes
a3fa59b12b
Merge "Kill host Linux AndroidConfig.h."
2015-08-20 23:10:05 +00:00
Elliott Hughes
b4ec57c016
am 00da9ced
: am ded991b4
: Merge "Revert "Fix Windows SDK build.""
...
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
Revert "Fix Windows SDK build."
2015-08-20 21:54:58 +00:00
Elliott Hughes
7f45f953ad
am 0049aecf
: am a6065996
: Merge "Stop defining WIN32."
...
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
Stop defining WIN32.
2015-08-20 21:54:57 +00:00
Elliott Hughes
73042ea0c7
Revert "Fix Windows SDK build."
...
This reverts commit b8dd176441
.
This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.
Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
2015-08-20 21:22:19 +00:00
Elliott Hughes
f0c04c7b2e
Stop defining WIN32.
...
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
2015-08-20 14:04:18 -07:00
Elliott Hughes
59b3bd27a0
am 896d0ee2
: am 999fd4ea
: Merge "Also -DWIN32 to keep llvm building."
...
* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
Also -DWIN32 to keep llvm building.
2015-08-20 19:32:39 +00:00
Elliott Hughes
29e8a32972
am 9f9d2aed
: am 79b199b8
: Merge "Fix Windows SDK build."
...
* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
Fix Windows SDK build.
2015-08-20 19:32:34 +00:00
Elliott Hughes
a65473b0e7
am 896b9c60
: am 57069e59
: Merge "Remove Windows AndroidConfig.h."
...
* commit '896b9c603938220ea40f75a07aef8ec1a0664f37':
Remove Windows AndroidConfig.h.
2015-08-20 19:32:30 +00:00
Elliott Hughes
e31dfe965f
Kill host Linux AndroidConfig.h.
...
We only build 64-bit now anyway.
Change-Id: I4bc9487522d215234509510bee66e4f210d86765
2015-08-20 11:14:23 -07:00
Elliott Hughes
0823ad3300
Also -DWIN32 to keep llvm building.
...
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
2015-08-20 11:10:22 -07:00
Elliott Hughes
b8dd176441
Fix Windows SDK build.
...
I forgot that removing a file doesn't cause a rebuild in our lame build
system, so I hadn't actually tested my previous change.
Change-Id: Ida19d4a8fd40e37029031eac4b4ca5f0cc5c895b
2015-08-20 10:19:26 -07:00
Elliott Hughes
f8241b41d5
Remove Windows AndroidConfig.h.
...
The only things left that we're using are the Windows target version
and _FILE_OFFSET_BITS=64, and they can go in the combo .mk.
Also fix the unused Windows 64 .mk.
Change-Id: I5f2458d67c0a8201196a339573f861bbf18b7eb8
2015-08-20 09:56:52 -07:00
Elliott Hughes
33a1439796
am 088849e2
: am b3c585d7
: Merge "Stop defining HAVE_MS_C_RUNTIME."
...
* commit '088849e24da28e398179cd915f142ca4224e6888':
Stop defining HAVE_MS_C_RUNTIME.
2015-08-19 22:31:13 +00:00
Elliott Hughes
19fa8413ed
Stop defining HAVE_MS_C_RUNTIME.
...
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
2015-08-19 14:22:59 -07:00
Dan Willemsen
1b14846717
am 48d95e75
: am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
2015-08-18 04:43:04 +00:00
Dan Willemsen
145ae32069
Remove legacy windows platform build support
...
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.
Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
2015-08-17 12:35:04 -07:00
Dan Albert
a1df0e6717
am 100422b2
: am 2e4b90e5
: Merge "Dedup system shared libraries."
...
* commit '100422b2311a96fbbdb1ba62a9945c2637c9e861':
Dedup system shared libraries.
2015-08-06 21:40:18 +00:00
Dan Albert
6d5c952a7e
am 849bf820
: am 735cd90d
: Merge "Disable transitive symbol resolving for mips64."
...
* commit '849bf82079ea33b84c7c01fbc2e52205843720ed':
Disable transitive symbol resolving for mips64.
2015-08-06 21:40:17 +00:00
Dan Albert
7ba582aec3
Dedup system shared libraries.
...
These shouldn't differ by target. Right now only mips64 does, and
that's a bug.
Change-Id: Ic941ede85ba1bc07d3316a55639ba71a6afc9630
2015-08-06 14:18:55 -07:00
Dan Albert
46ed1e8590
Disable transitive symbol resolving for mips64.
...
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.
This matches the change made for the the aarch64 toolchain:
https://android-review.googlesource.com/#/c/120654
Change-Id: Id5b2a63301cb1cdcdd84b4bcd9fbec8cf6ec0b3c
2015-08-06 14:18:55 -07:00
Elliott Hughes
6bec3e3aaa
am 1341e88c
: am 524a7e46
: Merge "Remove HAVE_WINSOCK."
...
* commit '1341e88c575a87bf1f4a05871fed78fad0fbe797':
Remove HAVE_WINSOCK.
2015-07-30 17:37:37 +00:00
Elliott Hughes
524a7e4693
Merge "Remove HAVE_WINSOCK."
2015-07-30 17:24:06 +00:00
Elliott Hughes
d82ef18a0e
am 49f80c6f
: am 51e2e589
: Merge "Remove the now-empty darwin AndroidConfig.h."
...
* commit '49f80c6f3795a4f3a888ca80e15b15204f4b61b5':
Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:32:10 +00:00
Elliott Hughes
7f80a9ed44
Remove the now-empty darwin AndroidConfig.h.
...
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
2015-07-30 09:16:01 -07:00
Elliott Hughes
325867c920
am 4887ee3b
: am cf427fb4
: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
...
* commit '4887ee3bdd6c1333b339eefee6d5f09300bbe14b':
Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 04:10:25 +00:00
Elliott Hughes
4a7a6c9a68
am 24ed450a
: am f07ddab1
: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
...
* commit '24ed450ad949ea06ac8cf1ecb0e8713c78edacfa':
Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:44:33 +00:00
Elliott Hughes
cf427fb4ae
Merge "Don't define S_IRGRP in AndroidConfig.h."
2015-07-30 03:43:38 +00:00
Elliott Hughes
f07ddab187
Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
2015-07-30 03:20:36 +00:00
Elliott Hughes
61c94258b1
Remove global Windows __BEGIN_DECLS/__END_DECLS.
...
Change-Id: Ic1ba634a0376c9c1b484098b4ca41cf7659f06b1
2015-07-29 20:14:59 -07:00
Elliott Hughes
47b557a9ca
Don't define S_IRGRP in AndroidConfig.h.
...
Nothing seems to be relying on this anyway.
Change-Id: I24e2509e4d24bc445961430bb74f8ca04135bc37
2015-07-29 19:26:39 -07:00
Elliott Hughes
1de24c7f64
Remove HAVE_WINSOCK.
...
Change-Id: I362451b68775de0216c5b8736f5cc16a7933b6c2
2015-07-29 19:05:24 -07:00
Ying Wang
fc07346366
am bb369efd
: am 1a5a615a
: Merge "Update mac_sdk_versions_supported."
...
* commit 'bb369efdf8e09f4fea2e2d2f835266ad8148bc0d':
Update mac_sdk_versions_supported.
2015-07-30 01:06:24 +00:00
Ying Wang
1a5a615a7b
Merge "Update mac_sdk_versions_supported."
2015-07-30 00:37:38 +00:00
Ying Wang
d1123ff4c5
Update mac_sdk_versions_supported.
...
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))
Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
2015-07-29 17:36:38 -07:00
Elliott Hughes
dc858cee0c
am 54307a26
: am 1dbb4166
: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
...
* commit '54307a260998d3ba955349e7a1bf0192731598aa':
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
2015-07-30 00:15:36 +00:00
Elliott Hughes
45e2a12bd7
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
...
Change-Id: I4143be14e5117526bfa98d83e246cc4360209c13
2015-07-29 15:31:39 -07:00
Elliott Hughes
7b5b86cf7d
am 8a5a0356
: am d3fd73f1
: Merge "Remove HAVE_WINDOWS_PATHS."
...
* commit '8a5a0356e8340ae7dce38d1bc346eb7675cf3f41':
Remove HAVE_WINDOWS_PATHS.
2015-07-29 16:26:30 +00:00
Elliott Hughes
b15b512825
Remove HAVE_WINDOWS_PATHS.
...
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
2015-07-29 08:45:40 -07:00
Ying Wang
57d9060ffd
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
(cherry-pick from commit c671a7cf5c
)
2015-07-21 14:07:50 -07:00
Ying Wang
c7a57e0756
am c671a7cf
: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:01:37 +00:00
Ying Wang
c671a7cf5c
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
2015-07-20 21:26:53 -07:00
Elliott Hughes
32fd6c9a03
am b211c8cf
: am 76eaa968
: Merge "Remove HAVE_WIN32_IPC."
...
* commit 'b211c8cf0994992f521f3406c3a173f64bf4fe0a':
Remove HAVE_WIN32_IPC.
2015-07-09 18:39:25 +00:00
Elliott Hughes
ba2f676410
Remove HAVE_WIN32_IPC.
...
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
2015-07-09 10:20:13 -07:00
Elliott Hughes
b9bdda3aff
am 7a4a9296
: am fd5692b3
: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
...
* commit '7a4a9296217932e78e9c7260167ac968ef86baf8':
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
2015-07-08 23:41:34 +00:00