Commit Graph

1183 Commits

Author SHA1 Message Date
Yabin Cui 2c1eb2fe21 am d8e38e1b: Merge "kill HAVE_INOTIFY"
* commit 'd8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
  kill HAVE_INOTIFY
2014-11-11 00:19:22 +00:00
Elliott Hughes d9dfdd0ce1 am 499ed6c4: am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '499ed6c496022acf5687c01bf2faf8420c6d3760':
  Remove HAVE_DIRENT_D_TYPE.
2014-11-11 00:16:20 +00:00
Yabin Cui c0ce08cc79 am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM"
* commit '3dbac214c22a44042f3e12da37f0fada341123da':
  kill HAVE_STAT_ST_MTIM
2014-11-11 00:14:25 +00:00
Yabin Cui d8e38e1b1a Merge "kill HAVE_INOTIFY" 2014-11-11 00:11:04 +00:00
Elliott Hughes 499ed6c496 am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
  Remove HAVE_DIRENT_D_TYPE.
2014-11-11 00:07:17 +00:00
Yabin Cui 3dbac214c2 Merge "kill HAVE_STAT_ST_MTIM" 2014-11-11 00:04:35 +00:00
Yabin Cui e8e5e99b76 kill HAVE_INOTIFY
Bug: 18314841
Change-Id: Idfcbeb62a57f72a47eb732f085fbd1ab27302f85
2014-11-10 15:44:27 -08:00
Elliott Hughes 07793e1880 Remove HAVE_DIRENT_D_TYPE.
Only Windows doesn't have it, and we don't build atree for Windows.

Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
2014-11-10 15:33:39 -08:00
Yabin Cui 4120e835fb kill HAVE_STAT_ST_MTIM
Bug: 18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
2014-11-10 15:27:49 -08:00
Yabin Cui 772034bc95 kill OS_CASE_SENSITIVE
Bug: 18314594
Change-Id: I5dc5072d43299c0e5d96ce9640e8405cbb633506
2014-11-10 15:03:11 -08:00
Yabin Cui c5ea225339 am ca28c637: am 1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER"
* commit 'ca28c6379c54e1abaebf4173d4d90b6501c09ae1':
  kill HAVE_SCHED_SETSCHEDULER
2014-11-10 22:35:07 +00:00
Yabin Cui ca28c6379c am 1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER"
* commit '1036850f8f8607f4d2898fcc73abb1fff23570d6':
  kill HAVE_SCHED_SETSCHEDULER
2014-11-10 22:30:42 +00:00
Yabin Cui 35e8e323bc kill HAVE_SCHED_SETSCHEDULER
Bug: 18300670
Change-Id: I66fb3d0070751ffaa2bc6b53274b22d967350312
2014-11-10 12:20:15 -08:00
Al Sutton 1199f7388c Fix building on modern versions of Xcode and OS X.
Add the build options to support the most recent versions of XCode and
add 10.9 to the list of OS X SDKs which the AOSP code can be built with.

Based on patch from https://groups.google.com/d/msg/android-building/kePgJmYBUdM/0C_d1OZflvcJ

Change-Id: I97ffe45d3c54a095952a4ac6accb938623b8fa1e
Signed-off-by: Al Sutton <al@funkyandroid.com>
2014-11-10 14:42:30 +00:00
Elliott Hughes 2ddbd98d6f am 65f5175f: am 652ff716: Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."
* commit '65f5175f06635d32f16f4057d2df036fa65723a5':
  Remove more namespace pollution (HAVE_TM_GMTOFF).
2014-11-08 23:42:30 +00:00
Elliott Hughes 65f5175f06 am 652ff716: Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."
* commit '652ff716b819b694be76e63f059dca50e7febb8d':
  Remove more namespace pollution (HAVE_TM_GMTOFF).
2014-11-08 23:38:56 +00:00
Elliott Hughes b7cca1d4c0 am 954729cc: am 3581753f: Merge "Remove more namespace pollution (HAVE_FUNOPEN)."
* commit '954729cc17da13a3ca887e51a5de4d9db8f11d16':
  Remove more namespace pollution (HAVE_FUNOPEN).
2014-11-08 22:22:13 +00:00
Elliott Hughes 89ac6e4c6f Remove more namespace pollution (HAVE_TM_GMTOFF).
Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
2014-11-08 14:21:12 -08:00
Elliott Hughes 954729cc17 am 3581753f: Merge "Remove more namespace pollution (HAVE_FUNOPEN)."
* commit '3581753ffae63e32b2b2e2be1e447cb2e83dec5e':
  Remove more namespace pollution (HAVE_FUNOPEN).
2014-11-08 22:17:44 +00:00
Elliott Hughes e5e26e2196 Remove more namespace pollution (HAVE_FUNOPEN).
Change-Id: I25a64ce39cd7bdd99aa6412413554b96d3cb113e
2014-11-08 12:39:28 -08:00
Elliott Hughes 23e9b766d6 am 011710ba: am 9e95a0f4: Merge "Remove more namespace pollution."
* commit '011710ba482e9ed9c45d95947b03d0d04001b995':
  Remove more namespace pollution.
2014-11-08 19:06:58 +00:00
Elliott Hughes 011710ba48 am 9e95a0f4: Merge "Remove more namespace pollution."
* commit '9e95a0f4d0172b1669d404c3d605e689234f4dcf':
  Remove more namespace pollution.
2014-11-08 19:03:04 +00:00
Elliott Hughes 9e95a0f4d0 Merge "Remove more namespace pollution." 2014-11-08 18:55:53 +00:00
Elliott Hughes b63a7c0dd9 Remove more namespace pollution.
Nothing in our tree is using this HAVE_BACKTRACE definition, but we do have
a hack in external/llvm to work around the namespace pollution.

Change-Id: Ib51d8bbd598dd2961a028216bf0b489dc7ad4880
2014-11-08 10:14:19 -08:00
Ying Wang f3fb63577b am 2874d0ba: am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."
* commit '2874d0ba8c71a464629fc148908d8c59854212df':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
2014-11-07 18:41:41 +00:00
Ying Wang 2874d0ba8c am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."
* commit '87bde62df4e5bb76f058394cd7fff8eaaf7e0d0c':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
2014-11-07 18:37:42 +00:00
Ying Wang 2ad87ebf26 Fix error of PRIVATE_LDLIBS introduced by de36cd72.
Change-Id: I85644899c8527e061c331eecc707ca1bb0e3fac4
2014-11-07 10:05:03 -08:00
Chih-Hung Hsieh 3be11c6e61 Upgrade host tool to x86_64-linux-glibc2.15-4.8
BUG: 17915392
Change-Id: I301b8ae70fabedfafea5ae0094bbd46c208f4622
2014-11-06 11:47:08 -08:00
Chih-hung Hsieh a5d7970715 am 18340084: am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '18340084172b98e44e44d994a2c326b2157c6c49':
  Revert "Continue to use march=i686 before fix of g++ ICE."
2014-10-30 18:38:51 +00:00
Chih-hung Hsieh 1834008417 am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '51e55c1d22576de38ca4b65deaded7b3a1af8387':
  Revert "Continue to use march=i686 before fix of g++ ICE."
2014-10-30 16:08:20 +00:00
Chih-hung Hsieh 51e55c1d22 Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit f70f009ca8.

Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
2014-10-30 01:55:45 +00:00
Chih-Hung Hsieh 23103f4fa9 am f70f009c: Continue to use march=i686 before fix of g++ ICE.
* commit 'f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
  Continue to use march=i686 before fix of g++ ICE.
2014-10-29 22:07:26 +00:00
Chih-Hung Hsieh f70f009ca8 Continue to use march=i686 before fix of g++ ICE.
BUG: 18174291
BUG: 18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
2014-10-29 14:46:15 -07:00
Chih-Hung Hsieh be971fc19b Continue to use march=i686 before fix of g++ ICE.
BUG: 18174291
Change-Id: Idb76afd715b7b7049b9e47f92f2658f6923c8448
2014-10-29 13:57:33 -07:00
Ian Rogers 5f60710fc9 am c156f68c: am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit 'c156f68cffdbd4bfd0c064d99e9968c466bb7309':
  Specify -mcpu=krait for clang.
2014-10-29 19:56:48 +00:00
Ian Rogers c156f68cff am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '508e27bfd7f470a945978c2b24403b0827dcde18':
  Specify -mcpu=krait for clang.
2014-10-29 19:43:16 +00:00
Chih-Hung Hsieh 66cca24a2c am 3b5261ac: am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '3b5261ac75f7d8d912e92fcdfdd76534a9bbe41b':
  Raise x86 arch requirement to prescott.
2014-10-29 17:32:09 +00:00
Neil Fuller c6adac18fe am c5c60e2c: am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'c5c60e2c2af542294d38dc0e2284115a62dbb310':
  Remove Java 6 build support
2014-10-29 17:32:08 +00:00
Chih-Hung Hsieh 3b5261ac75 am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '6555580d35ac570005923866fb4035265a0b5b98':
  Raise x86 arch requirement to prescott.
2014-10-29 17:11:49 +00:00
Neil Fuller c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Ian Rogers 508e27bfd7 am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
2014-10-29 12:32:37 +00:00
Ian Rogers e270873407 Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
2014-10-28 15:50:02 -07:00
Ying Wang f122cb8151 Merge "Support "LOCAL_FDO_SUPPORT := always"." 2014-10-28 22:47:30 +00:00
Ying Wang 45d0143ab1 Support "LOCAL_FDO_SUPPORT := always".
"LOCAL_FDO_SUPPORT := always" enables FDO without user specifying
"BUILD_FDO_OPTIMIZE := true", i.e. it turns on FDO for a
module in any build configuration.

Change-Id: I05d8db2edb2b3f5db073fa14d5bf1083a04571c0
2014-10-28 14:50:59 -07:00
Adam Lesinski 6143aeead0 am 256ea6ca: Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev automerge: 708e021
* commit '256ea6cad056df901785b8834c865fbb3f5afa71':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 19:18:18 +00:00
Adam Lesinski 256ea6cad0 Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
automerge: 708e021

* commit '708e021a319eea4cb549a73745fafb9467776fcf':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 18:09:11 +00:00
Chih-Hung Hsieh 6555580d35 am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit 'ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
  Raise x86 arch requirement to prescott.
2014-10-28 04:46:49 +00:00
Adam Lesinski b4efae440b Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
It's better practice to include the minimal set of windows APIs anyways
and we're not doing anything that requires more.

Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac
2014-10-27 14:26:35 -07:00
Neil Fuller f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Chih-Hung Hsieh ea503d21c7 Merge "Raise x86 arch requirement to prescott." 2014-10-23 20:47:30 +00:00
Neil Fuller 4dfda1fa42 Merge "Remove Java 6 build support" 2014-10-23 09:00:15 +00:00
Chih-Hung Hsieh c248fa3e01 Raise x86 arch requirement to prescott.
Atomic functions used in external/libcxx/include/atomic when compiled with Clang
will require intrinsic functions exist only for prescott or newer CPUs.

BUG: 17530542
Change-Id: I0c9660ed2ffa75b940981eb8165d88934b39aec5
2014-10-22 15:25:49 -07:00
Neil Fuller 46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01: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
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 ed8206dba4 Merge "Remove unnecessary 10.8-specific build rules" 2014-10-20 18:06:35 +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
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
Ian Rogers b55201f2b6 am 7cbe40ef: am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit '7cbe40efbb192f52ac27d9d6cebe01d465704058':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:16:29 +00:00
Ian Rogers 7cbe40efbb 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:11 +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 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 1b756930a2 am a8abcb36: resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp
* commit 'a8abcb365b8ea94c7672b09e851488d9454135ba':
  Link compiler-rt in the correct order.
2014-10-15 00:22:43 +00:00
Dan Albert a8abcb365b resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp
Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea
2014-10-14 17:17:22 -07: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
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 e86ee5e707 am 9b5e64a8: am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '9b5e64a80878131dbf1e78d92565f4c39bff5c63':
  Remove "-mstackrealign" option from all x86 builds.
2014-10-13 23:18:17 +00:00
Elliott Hughes 9b5e64a808 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:43 +00: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
Alexander Ivchenko ae2d47a47f Remove "-mstackrealign" option from all x86 builds.
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/

Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-10-13 19:08:01 +04:00
Dan Albert 462bd5fcb3 am ddbf420d: am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'ddbf420dae697510ea4d4b91f8082cd1396ccb8d':
  Stash original values of CC and CXX.
2014-10-06 19:31:16 +00:00
Dan Albert ddbf420dae am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 19:28:48 +00:00
Dan Albert cb6992b4b4 am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 18:46:03 +00:00
Dan Albert ec1b90f81f Stash original values of CC and CXX.
This way we can still access the real compiler as opposed to a wrapped
one.

Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
2014-10-06 10:43:29 -07:00
Stephen Hines b3a33ab8a1 am 5a217a9a: am dcc376ab: am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '5a217a9a105c861682e1bbd6017804ea6db66d24':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-02 12:52:11 +00:00
Stephen Hines 5a217a9a10 am dcc376ab: am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit 'dcc376abc3a085339e89faccccef61aaf8336966':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-02 12:41:49 +00:00
Stephen Hines f075ad906d am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '07a11d31f0baa355f9c3da60f965a56ff1d125e5':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-01 23:01:30 +00:00
Dan Albert bb27be166f am 21ba3a3b: am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '21ba3a3b6624d377ed886291af96a1cdb8d042ba':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:58:06 +00:00
Dan Albert 21ba3a3b66 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:54:43 +00:00
Dan Albert 3a4ae05422 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:50:08 +00:00
Dan Albert 2251ea40ba Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
2014-10-01 10:12:25 -07:00
Stephen Hines dc64c7b460 Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug: 14416410

prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".

Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
2014-09-30 02:38:41 -07:00
Ian Rogers 5c00e9cf5c am 740e46b5: am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit '740e46b549e170bec96c1a7103ccf51bd84ab908':
  Test __GLIBC__ is defined before using its value.
2014-09-26 16:01:58 +00:00
Ian Rogers ed51a9d21e am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit 'd1f73b018d3815eec54a6614a57ff3e25bbaf64a':
  Test __GLIBC__ is defined before using its value.
2014-09-26 15:53:57 +00:00
Ian Rogers 740e46b549 am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit 'd1f73b018d3815eec54a6614a57ff3e25bbaf64a':
  Test __GLIBC__ is defined before using its value.
2014-09-26 15:53:12 +00:00
Ian Rogers 850a4cb72b Test __GLIBC__ is defined before using its value.
Avoids -Wundef warning.

Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
2014-09-25 17:34:40 -07:00
Dan Albert 3beb83e518 am b43af880: resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp
* commit 'b43af8807f5420d9f4abc62f40f5fd8780fd9932':
  Add option for generating coverage info.
2014-09-24 17:25:56 +00:00
Dan Albert b43af8807f resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp
Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c
2014-09-24 09:51:05 -07:00
Dan Albert 7655a97984 resolved conflicts for merge of 326f9450 to lmp-dev-plus-aosp
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
2014-09-24 09:42:39 -07:00
Dan Albert 3302924802 Merge "Add option for generating coverage info." 2014-09-24 16:03:27 +00:00
Dan Albert 4bbc6c790b Add option for generating coverage info.
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.

Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.

This is currently not supported for clang (b/17574078, b/17583330).

If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.

Bug: 10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
2014-09-23 15:19:02 -07:00
Elliott Hughes 09b04f372f am c6794514: am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit 'c679451484b9450f53bbef4ec0cb3de64671f974':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:47:44 +00:00
Elliott Hughes c679451484 am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:37:19 +00:00
Elliott Hughes f811b82b4d am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:37:05 +00:00
Elliott Hughes 8fe8dc83e3 Remove unused HAVE_OFF64_T.
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
2014-09-23 13:36:01 -07:00
Elliott Hughes eb06275e16 am c1dd3578: am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit 'c1dd3578a7a014be94f57a3d64cf389db9edec3d':
  Remove the unused IPC macros.
2014-09-23 19:08:01 +00:00
Elliott Hughes b1db3ccef8 am ff9fd2c3: am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit 'ff9fd2c3edc5db2f7fd15d17bee083d4b2006327':
  build: remove HAVE_OOM_ADJ
2014-09-23 16:20:23 +00:00
Elliott Hughes c1dd3578a7 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
2014-09-23 16:17:33 +00:00
Elliott Hughes 0b1529d064 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
2014-09-23 16:16:48 +00:00
Elliott Hughes 76ab00f189 Remove the unused IPC macros.
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.

Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
2014-09-22 20:43:32 -07:00
Elliott Hughes c08b4f0389 am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
2014-09-23 02:09:15 +00:00
Elliott Hughes ff9fd2c3ed am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
2014-09-23 02:07:01 +00:00
Todd Poynor 9c226d1f9e build: remove HAVE_OOM_ADJ
This define is no longer used.

Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
2014-09-22 18:47:48 -07:00
Elliott Hughes 2cf3f3afdf am 6666562c: am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '6666562c275f854efbab580ad16ab7b38932fdf3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:41:08 +00:00
Elliott Hughes 6666562c27 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:17:04 +00:00
Elliott Hughes ae9c91b8b1 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:11:08 +00:00
Elliott Hughes e2f5470606 Merge "Remove unused HAVE_EPOLL." 2014-09-19 22:54:17 +00:00
Elliott Hughes 67839a58be Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.

Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
2014-09-19 15:12:56 -07:00
Dan Albert 38b8c39e4d am 46edd9b1: am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '46edd9b1035da5752e516e818db378554e1e0144':
  Move selection of C++ STL into the build system.
2014-09-19 08:32:11 +00:00
Dan Albert 220b01ba27 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:16:16 +00:00
Dan Albert 46edd9b103 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:15:23 +00:00
Dan Albert b05f2ca150 Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).

The selection of the STL is as follows:

    if LOCAL_CXX_STL == 'default'
      ifdef LOCAL_SDK_VERSION
        Use whatever STL the other NDK options have selected.
      else
        Use bionic's libstdc++ for target, GNU libstdc++ for host. This
        is compatible with the existing build options.
      endif
    else
      if LOCAL_CXX_STL == 'stlport'
        Use stlport.
      else if LOCAL_CXX_STL == 'libc++'
        Use libc++.
      else if LOCAL_CXX_STL == ''
        Don't use any STL.
      endif
    endif

Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-18 16:38:20 -07:00
Przemyslaw Szczepaniak fabd383bc8 Switch NDK libraries to 4.9 for x86_64 and mips64
Android NDK r10b doesn't even provide 4.8 for those
archs.

Change-Id: I10840c6c7bbc0dd9028a794162d021d8b3e6b19a
2014-09-16 15:17:47 +01:00
Alexander Ivchenko 4ee006e012 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
(cherry picked from commit 388dce3192)
2014-09-10 11:50:21 -07:00
Ying Wang a33c6151b0 am ecc28e95: am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit 'ecc28e9525e869f72ea0b1c70250db32d2d81e0a':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
2014-09-10 17:16:58 +00:00
Alexander Ivchenko 388dce3192 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
2014-09-09 17:27:32 +04:00
Andrew Hsieh 360b851034 Change mips64 default to mips64r6 from mips64r2
Also add back mips flags previously can't be handled by clang

See aosp/build
  13066a8d4c
  10326b3d7f

Change-Id: Iedc8dadd24f72fbd9c5589eec34677c1827290f3
2014-09-04 19:01:22 -07:00
Ying Wang 180b22590d am 729c9ff5: am 7754e0ce: Merge "[MIPS64] Modify the default MIPS64 build to MIPS64R6."
* commit '729c9ff5ec2085461027a5174d053e77b8c9a100':
  [MIPS64] Modify the default MIPS64 build to MIPS64R6.
2014-09-03 19:59:17 +00:00
Raghu Gandham 10326b3d7f [MIPS64] Modify the default MIPS64 build to MIPS64R6.
Change-Id: I797e4c2e5b69c6991545c26886b5b25e6f8c2a67
2014-09-02 16:30:00 -07:00
Ying Wang 7e5b951e4b am 33f14e60: am 7852b80c: Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don\'t support 64-bit on old Atom."
* commit '33f14e60729443b8c3958ea4246c914fc18891f9':
  Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom.
2014-09-01 18:10:33 +00:00
Ying Wang 7852b80c05 Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom." 2014-09-01 17:47:55 +00:00
Dehao Chen 19aa0acbf4 am 2d83365c: Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov." into lmp-dev
* commit '2d83365c9d852874bee790e2047178959933133e':
  Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
2014-08-21 17:52:54 +00:00
Elliott Hughes 5ba5283aee am 9f6ae4ba: am d61f0ffd: Merge "HAVE_FUTEX is unused."
* commit '9f6ae4ba5379df08d3bd6f60878718598bfa76d7':
  HAVE_FUTEX is unused.
2014-08-21 05:21:37 +00:00
Elliott Hughes 8f36565bc9 am 242f0540: am a9ec8350: Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP."
* commit '242f054094c5cafcd1d92c7ab1ed7b4459aedbf3':
  Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
2014-08-21 04:35:00 +00:00
Elliott Hughes d397f4ec9f am 3a2fc08d: am 10f5a420: Merge "HAVE_OPEN_MEMSTREAM is no longer used."
* commit '3a2fc08ddcbc9ddec1fa65722515501a406afbf4':
  HAVE_OPEN_MEMSTREAM is no longer used.
2014-08-21 04:34:58 +00:00
Elliott Hughes 0fa6a4063d HAVE_FUTEX is unused.
I missed this the other day.

Change-Id: Ifb6912de3aae6d03593ffb08d8d9555dc9e53f4d
2014-08-20 21:26:19 -07:00
Elliott Hughes a9ec8350b0 Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP." 2014-08-21 04:20:34 +00:00
Elliott Hughes 70f3f33c2d Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
https://android-review.googlesource.com/104945 removes the only user.

Change-Id: I303d941036ab889ab747f26561506a5e1c93f0c2
2014-08-20 20:21:29 -07:00
Dehao Chen f4294cd816 Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
Change-Id: I33a94abe58391a8564ada14417b0158ddd7ed2d6
2014-08-20 16:48:17 -07:00
Elliott Hughes 31c667ed3a HAVE_OPEN_MEMSTREAM is no longer used.
Bug: 17164505
Change-Id: I8055e52019d8cdea957d0fb8cbd46ca9b52564e1
2014-08-20 16:17:28 -07:00
Dehao Chen dcb92358c8 am 67ce4110: Merge "Check existance of profile directory for specific device." into lmp-dev
* commit '67ce41105eac775f90b129a295489a2ae3265cd1':
  Check existance of profile directory for specific device.
2014-08-18 23:12:25 +00:00
Elliott Hughes 1653580011 am ccf7c39d: am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."
* commit 'ccf7c39d628ca5a2070c8f7972178156460d6125':
  Remove unused entries from AndroidConfig.h.
2014-08-18 19:52:55 +00:00
Elliott Hughes 9b691ad231 am e70f4ed1: am f8d88579: Merge "Remove HAVE_GETTID."
* commit 'e70f4ed1d1bd558e04ab7ae181e7197c4e46e1b0':
  Remove HAVE_GETTID.
2014-08-18 19:34:51 +00:00
Elliott Hughes 032ac32bdb Remove unused entries from AndroidConfig.h.
We should probably try to remove these files completely, but this at
least takes care of the stuff that's completely obsolete.

Change-Id: Ic71b7b491c119963068294e258dc6afe5a45b40d
2014-08-18 12:18:59 -07:00
Elliott Hughes 1ac1401a06 Remove HAVE_GETTID.
Bug: 17048545
Change-Id: Ib5b72ecb451a26cb393147a44601566400ca1dd6
2014-08-18 10:49:12 -07:00
Dehao Chen 4e8f2ea6e8 Check existance of profile directory for specific device.
Change-Id: I149c257e98c8483b79f2afc1e5b871731f6f6519
2014-08-18 09:43:42 -07:00
Dan Albert 04cf315970 Inhibit implicit -Bsymolic in -shared.
Bug: 16853291

Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
(cherry picked from commit b6bb71b85d)
2014-08-08 08:15:19 -07:00
Dan Albert 908ab54fda Fix uses of -fPIC and -fPIE.
We've been using -fPIC and -fPIE together in the global cflags all this
time. These options are incompatible. The only reason we haven't been
hit by this before is because of the forced -Bsymbolic in GCC. To fix
this, pass -fpic when compiling objects for shared libraries and -fpie
when compiling objects for executables. For static libraries, also use
-fpic. We have to do this because static libraries might be included in
either a shared library or an executable. Code compiled with -fpie
cannot be included in a shared library, but code compiled with -fpic
may be included in an executable.

We've also been using -fpic and -fPIC together. These are different
options, and only the latter will take effect.
http://stackoverflow.com/a/967010

The final thing this fixes is that we had -f(PIC|PIE) flags being passed
to link commands. These are compile time flags, and don't do anything at
link time.

Bug: 16823325
Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
(cherry picked from commit 4803ce2696)
2014-08-08 08:15:14 -07:00
Ying Wang 5a5d443f15 am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW
2014-08-08 03:26:07 +00:00
Dan Albert 9d6aa51a0f am e99d8947: am cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
* commit 'e99d8947c09731d71db7e95a280cf81f51f4049a':
  Inhibit implicit -Bsymolic in -shared.
2014-08-08 00:23:56 +00:00
Dan Albert d423e5fbdb am 897cd3d4: am afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
* commit '897cd3d494272b8a6a12f0fb6d02bfe7426a309c':
  Fix uses of -fPIC and -fPIE.
2014-08-08 00:23:55 +00:00
Ying Wang 594a10ae77 Consistent use of USE_MINGW
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
2014-08-07 20:08:04 -07:00
Dan Albert 4803ce2696 Fix uses of -fPIC and -fPIE.
We've been using -fPIC and -fPIE together in the global cflags all this
time. These options are incompatible. The only reason we haven't been
hit by this before is because of the forced -Bsymbolic in GCC. To fix
this, pass -fpic when compiling objects for shared libraries and -fpie
when compiling objects for executables. For static libraries, also use
-fpic. We have to do this because static libraries might be included in
either a shared library or an executable. Code compiled with -fpie
cannot be included in a shared library, but code compiled with -fpic
may be included in an executable.

We've also been using -fpic and -fPIC together. These are different
options, and only the latter will take effect.
http://stackoverflow.com/a/967010

The final thing this fixes is that we had -f(PIC|PIE) flags being passed
to link commands. These are compile time flags, and don't do anything at
link time.

Bug: 16823325
Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
2014-08-07 10:20:58 -07:00
Dan Albert b6bb71b85d Inhibit implicit -Bsymolic in -shared.
Bug: 16853291

Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
2014-08-07 15:43:16 -07:00
Dehao Chen 60a27e8d35 am f15ad97a: Merge "Change profile use path to the newly created project." into lmp-dev
* commit 'f15ad97a0737ad42f663e1ca1702f6cf1831e532':
  Change profile use path to the newly created project.
2014-08-06 03:13:54 +00:00
Dehao Chen da26f200bd Change profile use path to the newly created project.
Change-Id: I3221a3b18e16d6a50cbc561c9cae1d1ab3999090
2014-08-05 15:32:41 -07:00
Duane Sand 02f285208c [MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.

Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.

(cherry picked from commit 6bab974cdc)

Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
2014-08-05 12:39:28 -07:00
Duane Sand 1d04a53ba3 [MIPS64] Enable mips64 clang
(cherry picked from commit 41ca444637)

Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
2014-08-05 12:38:31 -07:00
Duane Sand 3c4fcd8451 [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

(cherry picked from commit 6670e24aed)

Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
2014-08-05 12:28:44 -07:00
Varvara Rainchik 2d645ab323 Add missing flags to x86 (both 32- and 64-bit) arch variants.
Delete x86_64-atom.mk as we don't support 64-bit on old Atom.

Change-Id: I0b9ab61cd9b840f32c30059cb3ba9704c733c42a
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
2014-08-04 18:46:14 +04:00
Ying Wang fe2f5fe5cf am e0383397: am e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit 'e0383397a2be0be120da20cebd77e3f1f811a6b0':
  Update host linux toolchain to gcc 4.8
2014-07-31 18:04:20 +00:00
Dehao Chen 48065cb10e am e43c96c3: Merge "Update the FDO support:" into lmp-dev
* commit 'e43c96c332890a4641b9310aad9b4dddd80fabc0':
  Update the FDO support:
2014-07-31 16:56:10 +00:00
Elliott Hughes 1a6971b2f5 am c378352d: am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'c378352de8a07a7b8dabd444d130710ce1cb3eed':
  [MIPSR6] Add mips64r6 and mips32r6 targets
2014-07-30 23:30:07 +00:00
Elliott Hughes 81379e6590 am e4d54f31: am 0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit 'e4d54f317df641faf216e4000fbc3d091d3c1abc':
  [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
2014-07-30 23:30:05 +00:00
Ying Wang 1dd586eea2 am 3f191617: am 7a739f35: Merge "Use hermetic host toolchains."
* commit '3f1916174823fe6fd034ba07c762fae9a0143e44':
  Use hermetic host toolchains.
2014-07-30 16:22:08 +00:00
Ying Wang b53efd68b5 am 18c20aae: am aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '18c20aae44b5736b673c8776202e1e76b6bd81cd':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
2014-07-30 16:22:00 +00:00
Elliott Hughes d23798bfdc Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" 2014-07-30 11:26:00 +00:00
Ying Wang 7a739f3585 Merge "Use hermetic host toolchains." 2014-07-29 21:36:05 +00:00
Ying Wang 1b0fc43557 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
2014-07-29 18:05:27 -07:00
Dehao Chen e43c96c332 Merge "Update the FDO support:" into lmp-dev 2014-07-29 21:36:00 +00:00
Dehao Chen 5f5c48f0f1 Update the FDO support:
* Explicitly check BUILD_FDO_INSTRUMENT and BUILD_FDO_OPTIMIZE with true
* Remove unnecessary target_libgcov
* Update the profile collection path on device so that most app can have write access

Change-Id: I5c1915a12ea37b2cb3c76a27e7104e47ad636928
2014-07-30 16:54:55 -07:00
Ying Wang b169fb7822 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
2014-07-30 10:14:37 -07:00
David 'Digit' Turner 44ee3419e7 Update host linux toolchain to gcc 4.8
This patch ensures the build system uses the prebuilt gcc-4.8 toolchain
when building host Linux binaries, instead of the gcc-4.6 one.

Change-Id: I7b449650714ba4314a780827e0243f2af40ec82c
2014-07-31 19:51:40 +02:00
Ying Wang 5e2ebcbe26 Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
2014-07-28 15:14:51 -07:00
Przemyslaw Szczepaniak 28665b5850 am ac6a9195: Switch NDK arm64 libraries to 4.9.
* commit 'ac6a9195cadc83a50cea376fc61268db6fc2f129':
  Switch NDK arm64 libraries to 4.9.
2014-07-25 17:27:29 +00:00
Przemyslaw Szczepaniak ac6a9195ca Switch NDK arm64 libraries to 4.9.
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit 5895dd13a7)
2014-07-25 13:44:34 +00:00
Duane Sand 6bab974cdc [MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.

Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.

Change-Id: I1740a6c658304b6c41242be58d68753e6f171658
2014-07-24 11:19:21 -07:00
Stephen Hines e9bf1bdac6 Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev 2014-07-24 22:43:15 +00:00
Stephen Hines 76bd60b7da Default to "prescott" as our baseline i686 host build architecture.
Bug: 16408818

Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
2014-07-25 00:42:14 -07:00
Ying Wang 5de8ebc8f7 am 5d23800f: am 1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '5d23800f2b61c03a97395815e94d2aa44eea8577':
  [MIPS64] Enable mips64 clang
2014-07-24 01:49:26 +00:00
Ying Wang 8478ab00d0 am ebe0bacc: am 6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit 'ebe0bacc8063f74da5bacb80c5e0b97a00a7351c':
  Refactor FDO support code to ensure arm64 can also be built with FDO.
2014-07-23 23:41:18 +00:00
Duane Sand 6670e24aed [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32
2014-07-23 14:16:00 -07:00
Duane Sand 41ca444637 [MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
2014-07-23 14:10:39 -07:00
Ying Wang 1bb9adb880 Merge "[MIPS64] Enable mips64 clang" 2014-07-23 18:51:55 +00:00
Dehao Chen 7092c79a14 Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:34:07 -07:00
Dehao Chen 25671e15cc Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:23:46 -07:00
Elliott Hughes 0b3c42cbc8 Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" 2014-07-23 17:53:27 +00:00
Stephen Hines fee5160c11 am 786c565e: am 38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '786c565ea440de736af66b1b36ee72b6287bc1cc':
  Default to "prescott" as our baseline i686 host build architecture.
2014-07-22 20:53:44 +00:00
Stephen Hines 1b50a12a81 Default to "prescott" as our baseline i686 host build architecture.
Bug: 16408818

Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
2014-07-18 17:34:43 -07:00
Ed Heyl f6771f631b reconcile aosp (8689b90bcf) after branching. Please do not merge.
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
2014-07-14 23:32:28 -07:00
Nick Kralevich d07a58bc6d am 8689b90b: am 6ff84956: Merge "Fix PIC default to be -fPIC"
* commit '8689b90bcfdc92c94475901935b5f6efae0c9abc':
  Fix PIC default to be -fPIC
2014-07-14 18:17:18 +00:00
Ying Wang 98eb90f142 am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
2014-07-14 17:48:21 +00:00
Dan Albert 202c962b05 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-11 17:29:00 +00:00
Nick Kralevich 6ff849568c Merge "Fix PIC default to be -fPIC" 2014-07-10 00:35:03 +00:00
Ying Wang 26dbc3e6e4 am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
  More consistent use of 64-bit build variable.
2014-07-09 15:07:12 +00:00
Ying Wang d3b5d574de am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
2014-07-09 12:36:30 +00:00
Ying Wang 4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Dan Albert 8f73aeea87 am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
  Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert 3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Dan Albert 9d8d20a1e1 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-08 18:59:48 +00:00
Ying Wang e68ec71903 [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
2014-07-02 14:26:49 -07:00
Pavel Chupin 3a8d2bf392 Fix PIC default to be -fPIC
-fPIC is more restrictive than -fPIE, but when "-fPIC -fPIE" used together
the latter overrides. It may lead to issues when building DSO where
-fPIC and not -fPIE is required.

For executables -fPIE -pie shoudld be added and it's fine to override
-fPIC as it is done now.

The reason why we don't have these issues so far is probably related to
-Bsymbolic added by default. But any attempt to remove it reveals these
problems:
https://android-review.googlesource.com/#/c/98061/

Change-Id: If0f10628b7cc41e564221a7a37298f7d65f859a8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-07-02 13:52:21 +04:00
Elliott Hughes 0635498086 am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 23:04:35 +00:00
Elliott Hughes 3beb51692e Add -Wl,--fatal-warnings to x86_64.
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
2014-06-30 14:52:30 -07:00
Elliott Hughes 7ec725d41f resolved conflicts for merge of 53caaaf6 to master
Change-Id: I20d265364b09c64d3637e57f500e934ee2310887
2014-06-16 15:34:25 -07:00
Elliott Hughes bfe62fc30c Remove unused hosts.
Nobody is using freebsd-x86 or linux-ppc.

Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
2014-06-16 14:48:59 -07:00
Dan Albert 50031de36e Remove -Bsymbolic from builds.
This is causing issues when tools like asan try to wrap calls like
malloc. See the referenced bug for more details.

Bug: 15432753
Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
2014-06-13 10:24:12 -07:00
Elliott Hughes fd40d060d9 am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '7f880d15da4c73889833087161e4c05b55ef07fe':
  Remove useless stuff from "AndroidConfig.h".
2014-06-13 00:48:36 +00:00
Elliott Hughes e82d33d997 Remove useless stuff from "AndroidConfig.h".
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.

Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
Ying Wang dd4db3058a am 56ec31cf: am 3fe9a277: am d0f0918b: Merge "Reenable ccache."
* commit '56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
  Reenable ccache.
2014-06-06 18:43:44 +00:00
Ying Wang 67ed25f3a6 Reenable ccache.
The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
2014-06-06 11:18:04 -07:00
Primiano Tucci 454de52c96 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

(cherry-picked from AOSP 994c84fb40)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-03 12:24:22 +01:00
Primiano Tucci 994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-02 20:12:57 +01:00
Stephen Hines 88bd5edaa4 am 15d49c3b: am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '15d49c3b30d320422d0209c8726eb0c5cec92d41':
  Add -shared to clang LDFLAGS.
2014-05-30 23:15:43 +00:00
Nick Kralevich 43c36c8201 am ee7493cc: am 329988c2: am a42e0f50: Merge "arm64: restore relro/now"
* commit 'ee7493ccb91256e61414e8e0bad8d7173cb5d22e':
  arm64: restore relro/now
2014-05-30 23:02:54 +00:00
Stephen Hines a8b65126ca Merge "Add -shared to clang LDFLAGS." 2014-05-30 22:59:48 +00:00
Nick Kralevich 45545761d2 arm64: restore relro/now
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
2014-05-30 15:46:40 -07:00
Andrew Hsieh 4e5c08d420 am fb0a19d6: am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds"
* commit 'fb0a19d603b0f2c00ec3491a39d37103496cbca9':
  Add -latomic to all target builds
2014-05-30 11:50:52 +00:00
Tim Murray 0f9276d4ba Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.

Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
2014-05-29 17:54:07 -07:00
Andrew Hsieh 4c952d72b7 Add -latomic to all target builds
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.

Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.

Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
2014-05-29 11:40:46 -07:00
Dan Albert 49df673669 am cd74f307: am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit 'cd74f3073c4d0fa7d566705b0eb38c635c1c9344':
  Revert "Fix for duplicate names in whole static libs"
2014-05-27 19:50:55 +00:00
Dan Albert 3805f61915 Merge "Revert "Fix for duplicate names in whole static libs"" 2014-05-27 19:41:46 +00:00
Dan Albert 3c12b5c02b Revert "Fix for duplicate names in whole static libs"
This reverts commit 0e5ce8be34.

Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
2014-05-27 19:30:36 +00:00
Dan Albert d8303d9021 am e6918b55: am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs"
* commit 'e6918b559d911fd58dc03b60e4b866b23c935f72':
  Fix for duplicate names in whole static libs
2014-05-27 18:33:19 +00:00
Dan Albert 31101623b3 Merge "Fix for duplicate names in whole static libs" 2014-05-27 18:23:26 +00:00
Ying Wang bccdab8737 am 65475feb: am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '65475feb5999068096b287faac9199d1c8e18340':
  Exclude libstdc++ and libgcc if libc++ is requested.
2014-05-27 17:59:11 +00:00
Dan Albert 0e5ce8be34 Fix for duplicate names in whole static libs
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.

Bug: 15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
2014-05-23 18:23:47 -07:00
Ying Wang d90de32951 Exclude libstdc++ and libgcc if libc++ is requested.
Bug: 15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
2014-05-23 16:42:37 -07:00
Ben Cheng 35dcb507f7 am dfec8f89: am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit 'dfec8f8915ea5870c5e43549a1230d33585b6d89':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
2014-05-20 18:16:12 +00:00
Ben Cheng d033121431 Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*

GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).

Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
2014-05-19 16:22:21 -07:00
Ying Wang f1d722ba40 am fb71a59e: am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."
* commit 'fb71a59ef79d22c1acaf4a57980bc932886821cb':
  Fix the missing 2nd arch prefix.
2014-05-16 23:33:45 +00:00
Ying Wang ef773d22ca Fix the missing 2nd arch prefix.
Bug: 13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
2014-05-16 16:22:32 -07:00
Ying Wang 8200231ae1 am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
  Support host multilib build
2014-05-15 01:09:49 +00:00
Ying Wang 6feb6d5607 Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Andrew Hsieh 65c5313605 am f6566fd1: am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'f6566fd1f96275f6daec46ced8ceba25c87aedaa':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 01:02:56 +00:00
Andrew Hsieh fb1f38ecba Merge "Define __USE_MINGW_ANSI_STDIO for windows build" 2014-05-13 00:53:45 +00:00
Andrew Hsieh 9604c0680f am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit 'a01cb05450c6435c9cdca58534ed00eafb07f6eb':
  Disable canonical prefixes of system headers
2014-05-09 17:06:54 +00:00
Andrew Hsieh eca0043b86 Merge "Disable canonical prefixes of system headers" 2014-05-09 16:55:00 +00:00
Ying Wang 38e49504ef am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '96e487b262c2d5d7c02d49e29e71895588e15549':
  javac: rename common_flags to avoid conflictions
2014-05-09 16:54:38 +00:00
Andrew Hsieh 48f239c94f Disable canonical prefixes of system headers
GCC know a few pre-defined paths (relative to its location) to
search for headers, libraries, program, etc.  By default GCC prefixes
its own path(argv[0]) and calls realpath() which result in absolute
path with all symlink, . and .. removed.

It's usually good to have canonicalised paths, but absolute paths
in *.d file can cause unnecessary relinking when stale entries
in ccache cache hit

Add -no-canonical-prefixes (gcc>=4.6) and
-fno-canonical-system-headers (gcc>4.6) to disable realpath() on
prefixed paths

Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
2014-05-09 22:12:49 +08:00
Andrew Hsieh d322f2a6ef Define __USE_MINGW_ANSI_STDIO for windows build
Some printf/scanf functions in Windows aren't C99 compatible.
Define __USE_MINGW_ANSI_STDIO for mingw compiler to use it's own set of
replacement libraries which are more C99-like.

Change-Id: I51dfa582971ec0487409067e8bb7fe3a44577b93
2014-05-09 11:45:13 +08:00
Nick Reuter c43ab6edc2 javac: rename common_flags to avoid conflictions
* Currently the flag conflicts with one seen in hardware/qcom
   rename to avoid issues.

Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8
Signed-off-by: Nick Reuter <nreuter85@gmail.com>
2014-05-08 22:15:35 -05:00
Ying Wang cd88262744 am af93afce: am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit 'af93afcec91d31d1f5afb88b83413cdc7c019e70':
  Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 18:31:14 +00:00
Ying Wang de36cd72e8 Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.

Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
2014-05-07 11:33:19 -07:00
Ying Wang d8b39956f8 am 9c7393b8: am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"
* commit '9c7393b87aed5ae6acd97529b05ce26f80627259':
  add silvermont x86 architecture
2014-05-06 16:28:00 +00:00
Andrew Boie 155fc8b5fe add silvermont x86 architecture
This is used for Baytrail targets.

Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-04-30 01:23:25 +08:00
Elliott Hughes 52db54cc8e am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit 'bb21bfb090c29be17473b318a0d54ec5bcc5243c':
  Leave 'linux' defined on x86/x86-64, like arm.
2014-04-24 16:32:55 +00:00
Elliott Hughes 1d753dda0a am 439f279d: am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '439f279d0cd0a3c9118d7fcd688210bf614d69a9':
  Leave 'linux' defined on mips/mips64, like arm.
2014-04-24 16:29:25 +00:00
Elliott Hughes 847fd0311f Merge "Leave 'linux' defined on x86/x86-64, like arm." 2014-04-24 16:19:17 +00:00
Andrew Hsieh 582e5ecb75 am aabe27cc: am 9754735f: am db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit 'aabe27ccfd7f372d75426181eeeede4a7f908179':
  Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
2014-04-24 15:43:17 +00:00
Elliott Hughes 1acd8b0552 Leave 'linux' defined on mips/mips64, like arm.
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
2014-04-23 23:24:36 -07:00
Elliott Hughes 2c8e95528c Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
2014-04-23 23:09:30 -07:00
Andrew Hsieh dfde360b2c Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-23 14:47:00 -07:00
Ying Wang 6e048afb4b am ad60c86e: am f1a3d5e8: am 871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit 'ad60c86eda1a975d6966f414b4a7065d97e7505b':
  Update build system for better Clang behavior on Mac.
2014-04-23 00:23:22 +00:00
Tim Murray d318ba66f9 Update build system for better Clang behavior on Mac.
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22 09:26:22 -07:00
Ben Cheng 1d9c67ddc5 am 1bb663a8: am 26232093: am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '1bb663a8baf25afaab22fbe92130a302fb32814d':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
2014-04-18 21:18:37 +00:00
Ben Cheng e76fee59fc Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
This reverts commit 084a7f8387.

GCC 4.9 still has stability issues (b/14160872)

Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
2014-04-18 18:34:35 +00:00
Ben Cheng 5de2b7ffe0 am ea9552eb: am dc82c5a8: am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit 'ea9552eb2cf68c96078f2128b95490c08a9ec81b':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
2014-04-17 19:36:49 +00:00
Ben Cheng 084a7f8387 Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
2014-04-16 12:18:14 -07:00
Andrew Hsieh d37bf4e995 am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"
* commit 'f93c7c70247fb11dc99361c309bd6bd7b859e30e':
  Add -Wl,-maarch64linux
2014-04-15 23:37:09 +00:00
Narayan Kamath a1f8afa930 am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit 'd954c6b92024fbb183ea3acb7366a39765a6e3c0':
  "desktop" linux has Posix clocks.
2014-04-15 20:52:52 +00:00
Andrew Hsieh 50536c20af Add -Wl,-maarch64linux
The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with
backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/

The existing ld.bfd is fine because it's configured to support
aarch64linux only.  ld.mcld (see https://android-review.googlesource.com/#/c/91047)
needs explicit emulation switch because it supports multiple targets

Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
2014-04-15 11:54:06 -07:00
Narayan Kamath 22261a3f9b Merge ""desktop" linux has Posix clocks." 2014-04-15 10:58:52 +00:00
Ben Cheng bdcb4bcd7b am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit 'e921da9def56e6f70de3df18f0582a69826d9787':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
2014-04-11 23:47:51 +00:00
Ben Cheng 38fef38c40 Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This reverts commit 1ae9b213eb.
Sigh... new warnings found by 4.9 break checkbuild.

Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
2014-04-11 23:36:25 +00:00
Ben Cheng 2b240a7bd2 am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit 'c9f9decdcaa6c3314c11edba0bf9703edf09615e':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
2014-04-11 22:44:05 +00:00
Ben Cheng 1ae9b213eb Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
 __cxa_throw_bad_array_new_length.

Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
2014-04-11 12:22:56 -07:00
Ben Cheng 19b7c4d5c9 am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit 'e4d787bfbbde83bc4b868ed804c94118c2ea0080':
  Decouple platform compiler and NDK library versioning.
2014-04-11 17:10:37 +00:00
Ben Cheng 4de6fa4069 Decouple platform compiler and NDK library versioning.
TARGET_GCC_VERSION: select compiler from prebuilts/gcc/...
TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/...

Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
2014-04-10 22:46:26 -07:00
Ben Cheng 335c76d886 am c77ffa89: am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit 'c77ffa8923d95f8bd4639bf9e810b0c981481e54':
  Revert "Use aarch64-linux-android-4.9 for arm64 build."
2014-04-10 17:24:46 +00:00
Ben Cheng 13eaf184f6 Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build."" 2014-04-10 17:14:57 +00:00
Ben Cheng 81892e29ff Revert "Use aarch64-linux-android-4.9 for arm64 build."
This reverts commit 6154690d86.

Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
2014-04-10 17:14:01 +00:00
Ben Cheng c760ecbd22 am 9cbf732f: am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '9cbf732fa345a1ef8d540b8934a59502d7fdd627':
  Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:43:08 +00:00
Narayan Kamath 163140ceaf "desktop" linux has Posix clocks.
Change-Id: I90885a2bbb65f14f774ae72b2ca6738176bf0341
2014-04-10 17:36:53 +01:00
Ben Cheng d957d6bbdb Merge "Use aarch64-linux-android-4.9 for arm64 build." 2014-04-10 16:33:51 +00:00
Ben Cheng 6154690d86 Use aarch64-linux-android-4.9 for arm64 build.
Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
2014-04-09 15:58:08 -07:00
Ying Wang 9ef2bee21a am 09ba20ce: am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '09ba20ce647472ca6f5692bcf6eb5477fc3a818d':
  Increase the maximum javac heap size again.
2014-04-09 21:37:16 +00:00
Ying Wang d81d71a020 Increase the maximum javac heap size again.
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
2014-04-09 14:27:29 -07:00
Narayan Kamath ed1c119375 am 6c0fba0f: am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '6c0fba0f989ce9755a4f4303149355dd0d4ea60d':
  Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:19:44 +00:00
Narayan Kamath e6243e176b Stop defining HAVE_TIMEDWAIT_MONOTONIC.
We no longer provide this function in bionic. All callers
should be moved over to pthread_condattr_setclock().

Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
2014-04-09 16:08:09 +00:00
Narayan Kamath c84889b80a Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
	core/main.mk
2014-04-04 18:44:47 -07:00
Narayan Kamath 422fadcf79 Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
2014-04-04 09:55:57 +01:00
Christopher Ferris 707354c0ad am fc1a735e: am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit 'fc1a735ec618791df306ad2a8f2f94a3db10284d':
  Specify -mcpu=cortex-a15 for denver CPU variants.
2014-03-31 19:50:03 +00:00
Christopher Ferris 0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00
Ying Wang 82784b285a am 1758fe1f: am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '1758fe1f87b58f91db569ba3c0fa406f5f37819e':
  Remove the unnecessary indirection of TARGET_STRIP_COMMAND
2014-03-31 17:43:57 +00:00
Ying Wang ce1c596e15 Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Now all archs use the same strip command which can be put just in
transform-to-stripped.

Change-Id: Ief79697d47ea142fc9e63e63a7e2dace9e839165
2014-03-28 17:25:34 -07:00
Ying Wang d2c1f1228d am 9efc18fb: am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."
* commit '9efc18fb99d6d4229a1d4ad993b50b6ffb15f054':
  Increase the maximum javac heap size.
2014-03-27 19:14:34 +00:00
Ying Wang 01f11b2aa9 Increase the maximum javac heap size.
Java 7 needs more memory when you run some annotation tools.

Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
2014-03-26 19:23:46 -07:00
Tim Murray 1bbba7d404 am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '9c08a73b242344a18676a2c5b17f5d475abef16f':
  Make Clang host builds hermetic on Linux.
2014-03-25 21:22:55 +00:00
Tim Murray 02cefc93a8 Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.

bug 13435344

Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
2014-03-24 19:38:47 -07:00
Shu Zhang 453afb242c Specify -mcpu=cortex-a15 for denver CPU variants.
Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
2014-03-24 16:19:50 +08:00
Christopher Ferris ddb9b4042e am 10eaabfc: am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit '10eaabfceb715baecbcdf71ebfb4f108ce295fb6':
  Add a method to leave the symbol table in a library.
2014-03-19 18:25:22 +00:00
Christopher Ferris a6e2f9322c Add a method to leave the symbol table in a library.
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.

This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.

Bug: 12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
2014-03-18 17:34:41 -07:00
Ying Wang 8888faa549 am 5245393e: am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
* commit '5245393ef6b18c181fac43111a1dbfa6f829af01':
  Remove arm64 clang build warning
2014-03-18 23:17:40 +00:00
Ying Wang ed56902c29 Remove arm64 clang build warning
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
2014-03-18 15:58:13 -07:00
Colin Cross 0af8bc1ed1 am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit 'c48da22b6d0f7be0b9ce9f1d448fc524e692e86c':
  Work in progress to enable build system support for Clang.
2014-03-16 00:06:17 +00:00
Colin Cross db24577bbd Merge "Work in progress to enable build system support for Clang." 2014-03-15 23:54:03 +00:00
Andrew Hsieh 51ffb467a9 am 70dff286: am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '70dff2866fd7a22a7248a80fd888d167c0f7636a':
  Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 17:13:11 +00:00
Tim Murray b5f333bbef Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Andrew Hsieh cbe162e914 Fix HOST_TOOLCHAIN_PREFIX
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
2014-03-12 19:27:59 +08:00
Ying Wang df925cefc1 am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit 'f91a014f6f2c176f6e1f99cb3bb90d707e0be31c':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-11 02:15:11 +00:00
Ying Wang ba8b377d89 Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
2014-03-10 18:59:12 -07:00
Ian Rogers 67d675af0e am d5cd41fe: am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit 'd5cd41fe6d9d140e84703e87cec1f83660e568e3':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-11 00:37:50 +00:00
Ian Rogers aa54033b46 Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Change-Id: I945128b3087b28f62467c7123b759e3514027574
2014-03-10 16:49:41 -07:00
Ian Rogers 17fe9e3000 am 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '17536801ea179360da3ba2886dfc48dda392d28a':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 23:42:20 +00:00
Ian Rogers c61a9425cd Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This reverts commit 668427c941.

Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
2014-03-10 23:27:01 +00:00
Ian Rogers 368790a734 am 4d16757b: am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '4d16757b201003cd25b0b27a717b1bc7c32a6dd8':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 22:58:18 +00:00
Ian Rogers 668427c941 Define __STDC_LIMIT_MACROS globally to work around host build differences.
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
2014-03-10 15:30:39 -07:00
Ying Wang d4fe0bdfcb am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."
* commit '9b996f80a95f48bae153c35bacc0360c004e5258':
  Make -rpath-link work with multilib.
2014-02-22 00:58:46 +00:00
Ying Wang 9fb3526648 Make -rpath-link work with multilib.
Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
2014-02-21 16:20:20 -08:00
Ying Wang 039107aa8d am e9bb9870: am 9335001d: Merge "Strip all symbols on x86"
* commit 'e9bb9870027429b56e42604802b07c1c3d7a8a4e':
  Strip all symbols on x86
2014-02-20 23:02:03 +00:00
Ying Wang 21bcdbc8ba am a5e79db0: am f9538ea6: Merge "Add missing s to mips."
* commit 'a5e79db0791340e0b6837903c234c3f97d4c5332':
  Add missing $(combo_2nd_arch_prefix)s to mips.
2014-02-20 21:28:00 +00:00
Ying Wang 9335001d5d Merge "Strip all symbols on x86" 2014-02-20 18:31:07 +00:00
Elliott Hughes 369b3326f3 Add missing $(combo_2nd_arch_prefix)s to mips.
Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
2014-02-19 20:29:25 -08:00
C. Sean Young b47c863ec7 Strip all symbols on x86
Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.

Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
2014-02-19 12:53:43 -08:00
Ying Wang 3c5f698cea am 21ec64b1: am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
* commit '21ec64b16914dfd05e07558b00ada867b7aa8b6e':
  Fix x86 config file to support 2nd ARCH build
2014-02-19 18:34:48 +00:00
Ying Wang 315522ec29 am 32e93384: am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
* commit '32e93384b73746c54f8bc0e8a7b818acc5c1b00e':
  Switch x86_64 to gcc-4.8
2014-02-19 18:31:16 +00:00
Ying Wang 5aa50c6637 Merge "Fix x86 config file to support 2nd ARCH build" 2014-02-19 18:19:22 +00:00
Ying Wang 3d9c1c1a53 Merge "Switch x86_64 to gcc-4.8" 2014-02-19 18:17:52 +00:00
Colin Cross eb6a43654e am c798836a: am 4febec12: Merge "x86: set -msse2 for all builds"
* commit 'c798836a82584744a02a26c57f2733fcb0b0e0cf':
  x86: set -msse2 for all builds
2014-02-19 01:12:40 +00:00
Colin Cross 4aa263f2be x86: set -msse2 for all builds
All supported x86 processors have SSE2.

Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
2014-02-18 15:49:48 -08:00
Pavel Chupin c562742e0b Switch x86_64 to gcc-4.8
x86 is already on gcc-4.8

Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-02-18 17:02:36 +04:00
Qiming Shi 310324d28a Fix x86 config file to support 2nd ARCH build
Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 17:46:48 +08:00
Stephen Hines 34c6ac77c2 am c4206df9: am 051e28fe: Merge "Fix incorrect x86 build rules."
* commit 'c4206df9e8b59d1e9e948033e02ec08620f31c8b':
  Fix incorrect x86 build rules.
2014-02-14 23:41:20 +00:00
Stephen Hines 6d5dd2367a Fix incorrect x86 build rules.
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.

Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
2014-02-13 09:24:29 -08:00
Ben Cheng 2ad7d4df07 am 7495e68a: am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '7495e68a61075ef592aff6f2ba4d1d06fe3fedf4':
  Refreshed gcc predefines __ANDROID__
2014-02-10 12:50:55 +00:00
Ying Wang 956cd05468 am 34afc565: am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '34afc565b41989f07d6e479def5e849aeaad1ac9':
  Select the arch_variant_cflags for the 2nd arch.
2014-02-10 12:50:55 +00:00
Ben Cheng 6c5d897648 Merge "Refreshed gcc predefines __ANDROID__" 2014-02-07 21:36:46 +00:00
Ben Cheng 859c826ffc Refreshed gcc predefines __ANDROID__
Change-Id: Id76f5a7490fba8190329e5ce3c4b138976a034ce
2014-02-07 13:16:18 -08:00
Ying Wang de9955c35e Select the arch_variant_cflags for the 2nd arch.
Change-Id: Id2f9d7073a4aae3ba0fe5e5464045761f4d42b4e
2014-02-07 10:44:10 -08:00
Elliott Hughes 3e3cde556f am 4d5fa510: am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '4d5fa510977d8d698ec75d128efc4e71173ae697':
  Turn 64-bit-related warnings into errors on 64-bit builds.
2014-02-06 21:03:37 +00:00
Elliott Hughes 8b20d5b97e Merge "Turn 64-bit-related warnings into errors on 64-bit builds." 2014-02-06 20:54:05 +00:00
Elliott Hughes 77f88ce0da am 3f040869: am efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '3f0408695b23a8d21c3227ae845006381b26f666':
  [MIPS64] Add mips64 target
2014-02-06 20:29:48 +00:00
Chris Dearman 1efd9e462a [MIPS64] Add mips64 target
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
2014-02-05 19:07:57 -08:00
Elliott Hughes 18042e1960 Turn 64-bit-related warnings into errors on 64-bit builds.
I don't think we can realistically turn this on for 32-bit builds any
time soon.

Also, fix the arm64 stack-protector hack.

Change-Id: Ie1e7c875bbc06fb21bb372b8ca99879a23ef53d4
2014-02-05 17:40:02 -08:00
Colin Cross 98255dc988 am d69ed2e2: am 054b0274: Merge topic \'arm64\'
* commit 'd69ed2e25c59803bbbbbee7c09551efb3ed0c49d':
  add support for more LOCAL_*_arch variables
  don't rename 32-bit executables to *_32
  remove 2nd arch from ARCH_ARM_* defines
2014-02-06 00:06:30 +00:00
Colin Cross ec14ce578b remove 2nd arch from ARCH_ARM_* defines
Users of ARCH_ARM_* defines don't care about first vs. second arch,
set ARCH_ARM_* regardless of which arch is arm.

Change-Id: I2ae83ec5c3f839ff91a0e352c95d76ec2cbd5dc5
2014-02-04 19:44:09 -08:00
Narayan Kamath 7201cdef71 am b1aec05a: am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit 'b1aec05aae44b541aa4c579f7cc700700c91bc0b':
  Define __STDC_FORMAT_MACROS on Windows host builds.
2014-01-31 16:41:26 +00:00
Ian Rogers 0e0b880c4b am eb02fa0a: am 805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit 'eb02fa0a6b87682daca29e2ffdd6d7b422acc79f':
  Fix the host inttypes.h problem globally.
2014-01-31 16:41:24 +00:00
Ian Rogers 694b2b7b12 Define __STDC_FORMAT_MACROS on Windows host builds.
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
2014-01-29 21:37:37 -08:00
Ian Rogers 61e5059ef7 Fix the host inttypes.h problem globally.
Bug: 12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
2014-01-29 16:29:11 -08:00
Elliott Hughes b058eeae6a am bc528c22: am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit 'bc528c22b8225e539165f5c86ea0256e57cc7206':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:54:46 +00:00
Elliott Hughes 1a731adf94 Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 2014-01-28 21:23:07 +00:00
Elliott Hughes 171e940c7a Fix KERNEL_HEADERS_ARCH for mips and x86.
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)

Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
2014-01-28 13:10:19 -08:00
Colin Cross ed9f6bb384 am 23710e27: am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '23710e27bc23bb32dc99f35ec0c31e4185586ec0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:40:00 +00:00
Colin Cross 8f47fc379e Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support.  These will be
filtered out of the cflags provided by the module.

Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.

Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
2014-01-27 18:21:12 -08:00
Elliott Hughes d63d974c49 am 6fe9a949: am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
  Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00:00
Elliott Hughes 2f8dcdd961 Remove libthread_db from the default include path.
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross c3256c770d build: use arm kernel headers for arm 2nd arch builds
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
2014-01-24 13:41:00 -08:00
Ying Wang 4d2cc665ea Set up rules to build shared libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
2014-01-24 13:35:30 -08:00
Ying Wang 6ef6519170 Set up rules to build static libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
2014-01-24 13:35:09 -08:00
Ying Wang 1d274d2686 Load compiler environment for a second arch.
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30

Conflicts:
	core/combo/TARGET_linux-arm.mk
2014-01-24 13:34:26 -08:00
Colin Cross 194c2a39be am de89397b: am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64"
* commit 'de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
  build: rename aarch64 target to arm64
2014-01-24 21:24:54 +00:00
Colin Cross 4f0eb7d50c build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00
Colin Cross 3814cbfd33 build: use arm kernel headers for arm 2nd arch builds
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
2014-01-21 17:01:20 -08:00
Ying Wang 791fa6a909 Set up rules to build shared libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
2014-01-16 15:43:47 -08:00
Ying Wang 61d499b965 Set up rules to build static libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
2014-01-16 14:34:13 -08:00
Ying Wang e1d44c3b4a Load compiler environment for a second arch.
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30
2014-01-16 14:30:02 -08:00
Ying Wang 2f68fddd07 am 4339ad4a: am da9ef76b: am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '4339ad4ac1e0170c7c7497c2b3480b2154fcd8ac':
  [MIPS] Reenable linker fatal-warnings
2014-01-16 01:17:22 +00:00
Chris Dearman 13eb1eb53d [MIPS] Reenable linker fatal-warnings
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
2014-01-15 19:00:37 +00:00
Elliott Hughes 363948afb1 am 17657ec7: am 538009b2: am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '17657ec7f71a7be5c71f3b42b217d9ec45079f3b':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
2014-01-11 00:57:27 +00:00
Elliott Hughes 37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
2014-01-10 16:35:08 -08:00
Brian Carlstrom 978155b7d0 am 6e984e2d: am 1df8d179: am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '6e984e2d8cfc3ac7affa59e8b7440c8e5fc8b16f':
  Add support for ALTERNATE_JAVAC
2014-01-10 02:42:36 +00:00
Brian Carlstrom b6dcef8777 Add support for ALTERNATE_JAVAC
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
2014-01-09 15:33:23 -08:00
Elliott Hughes c367d348fd am c5f05645: am b986ad2a: am 9464ca1b: am b8559790: Merge "Remove a non-existent directory from the include path."
* commit 'c5f05645ebde67561dc0a1735cc3eb262c37beb9':
  Remove a non-existent directory from the include path.
2013-12-21 00:05:42 +00:00
Elliott Hughes 26990f5573 Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.

Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
2013-12-20 15:37:55 -08:00
Elliott Hughes 7cefbb1c78 am 112bd5ad: am 85967c7e: am d46e3f1f: am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
* commit '112bd5ad2e57c621abbb36035e1820d7844882b9':
  Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 23:42:20 +00:00
Elliott Hughes 98593a66af Fix aarch64 and x86-64 AndroidConfig.h.
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.

Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
2013-12-18 15:17:42 -08:00
Christopher Ferris d6ef972aea am 5b2d734d: am 5fb7c74a: am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit '5b2d734d2ce214f2fb7c91d6326ee600b1a97ceb':
  Re-enable uapi kernel headers for arm.
2013-12-17 23:22:41 +00:00
Christopher Ferris d12ee620b0 Merge "Re-enable uapi kernel headers for arm." 2013-12-17 23:06:38 +00:00
Elliott Hughes e3e511b71a am ce0d80b0: am 07d4b794: am 861fea29: am 3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit 'ce0d80b0aa40f8ec5456ad07fa28c8beac82ded0':
  Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 15:50:12 +00:00
Elliott Hughes c294779d7f Make aarch64 more like arm wrt strict-aliasing.
All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64
porting any more difficult than it needs to be.

Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
2013-12-16 18:01:19 -08:00
Christopher Ferris 9824ce4e1d Re-enable uapi kernel headers for arm.
Bug: 11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
2013-12-16 13:58:39 -08:00
Christopher Ferris 68aec9bd01 am c4d168b9: am bc7064b5: am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit 'c4d168b9d0d277255ac0473632f2c9bc103fe0f2':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 18:43:24 +00:00
Christopher Ferris e2c73b3194 Revert "Enable uapi kernel headers for arm."
This reverts commit 88c6c533e1.

Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
2013-12-16 18:21:27 +00:00
Christopher Ferris 84c6144c52 am 675041d1: am 5e55aabc: am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '675041d128a87378c959fd4b75bfe949a3818947':
  Enable uapi kernel headers for arm.
2013-12-16 18:08:39 +00:00
Christopher Ferris 88c6c533e1 Enable uapi kernel headers for arm.
Bug: 11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
2013-12-16 09:12:19 -08:00
Ying Wang a27fd616c0 am 5023bb57: am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit '5023bb574f5e0e29a8434734ca1db52b6a35bf6a':
  Enable NX protections
2013-12-13 00:17:27 +00:00
Ying Wang 5859f105fa Merge "Enable NX protections" 2013-12-13 00:04:42 +00:00
Ben Cheng 92dd82a6e2 am 462b1ca7: am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '462b1ca7f6268282f147961aa03ca2433d59af17':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:06:59 +00:00
Ben Cheng cd7b02d911 Add an explicit definition of __ANDROID__=1
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.

Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
2013-12-12 13:08:55 -08:00
Joshua J. Drake afb45637b2 Enable NX protections
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling host-side applications.  This enables
NX protections, which prevent code from executing on the
stack or heap.  NX protections make exploiting memory
corruption issues more challenging and is an important
security feature.

Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
2013-12-12 10:47:08 -08:00
Ying Wang d56f77da5d am 952a1bfb: am 580b3963: am 0e2779bd: am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '952a1bfbb7070507e3ce5340e55210a10af8a016':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
2013-12-11 21:09:38 +00:00
Ying Wang 8a373fd5ae Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64" 2013-12-11 17:52:26 +00:00
Alexey Volkov a1779eb11b Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
2013-12-11 17:18:56 +04:00
Narayan Kamath 1d755aaa7b resolved conflicts for merge of 6835cbf9 to master
Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7
2013-12-06 17:31:38 +00:00
Narayan Kamath e2d27887be A few more Java7 related clean ups.
- Separate SDK checking from version checking and
  make messages clearer.
- Add explicit source & target versions for javac to
  make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
  EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
  no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
2013-12-05 13:23:06 +00:00
Ying Wang 1fdef9f6f8 am 04324c27: am 6178f6f0: Merge "Run ar in Deterministic mode."
* commit '04324c2780b1377ada547a7027aec8c890b9db0e':
  Run ar in Deterministic mode.
2013-12-02 23:32:10 +00:00
Ying Wang b2f39181c6 Run ar in Deterministic mode.
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705

Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
2013-12-02 14:15:23 -08:00
Elliott Hughes a09a9c11da am 38b14290: am 66153e38: Merge "Switch x86 over to uapi-only."
* commit '38b14290ea45d410969df9f62f5b39787586ca3a':
  Switch x86 over to uapi-only.
2013-11-27 10:47:45 -08:00
Elliott Hughes 66153e38b0 Merge "Switch x86 over to uapi-only." 2013-11-26 18:51:47 +00:00
Elliott Hughes 1e398e0281 am 9128d725: am 46288040: Merge "Switch MIPS over to uapi-only."
* commit '9128d7253d0684be3a2808c21f8b97c6f76f84d0':
  Switch MIPS over to uapi-only.
2013-11-26 08:42:22 -08:00
Ying Wang ad69099131 Add experimental flag to support OpenJDK builds.
bug: 8992787

(cherry picked from commit d1dbe7f5a2)

Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
2013-11-26 10:30:14 +00:00
Elliott Hughes e5df095b76 Switch x86 over to uapi-only.
Bug: 11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
2013-11-25 16:38:47 -08:00
Elliott Hughes b88bdebcb9 Switch MIPS over to uapi-only.
Bug: 11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
2013-11-25 14:01:10 -08:00
Elliott Hughes b5fdb3a947 am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit '3b54d5a5fc492de5b28d905d0be36be66acec791':
  Add a "reverse AUX hack" for ARM.
2013-11-25 13:50:26 -08:00
Elliott Hughes 9696acae02 Add a "reverse AUX hack" for ARM.
MIPS and x86 are almost completely switched over to uapi-only. ARM is still
currently old-only. A cleanup of the uapi headers over the weekend means
that the uapi-only <linux/kexec.h> is now in the right place, which will break
the ARM build unless the ARM build also looks in the uapi headers if it can't
find an old header.

Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461
2013-11-25 12:06:25 -08:00
The Android Open Source Project b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Elliott Hughes dbecf2bbe9 am e0daed20: am a59b8545: am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'e0daed20a6dfbd767ece790a30f68e602a0ec1ad':
  Switch mips to the uapi kernel headers.
2013-11-21 17:12:13 -08:00
Elliott Hughes e0daed20a6 am a59b8545: am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'a59b8545cf1aa013cf87b9946e738e0add1f4536':
  Switch mips to the uapi kernel headers.
2013-11-21 17:07:48 -08:00
Elliott Hughes 3e416594b0 am a4a1061f: am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'a4a1061fbf5e59319510528a7eda77fe8f6fbd09':
  Switch x86 to uapi headers.
2013-11-21 10:15:32 -08:00
Elliott Hughes a4a1061fbf am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'bd36506ee4ece41b8a32ac5b078e4538af4bc02a':
  Switch x86 to uapi headers.
2013-11-21 10:12:26 -08:00