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
Ying Wang
f817876b99
am 1b4252cd
: am 0f78b47b
: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
...
* commit '1b4252cd0312695827529f2a8470b68e5a5c05e2':
Switch AOSP X86/MIPS compiler to gcc4.8
2013-11-21 08:09:45 -08:00
Elliott Hughes
66ef53d83b
Switch mips to the uapi kernel headers.
...
Bug: 11559337
Change-Id: Ic37b284398c049011f98651de84cef760566ebde
2013-11-20 12:55:09 -08:00
Elliott Hughes
2d9dc89962
Switch x86 to uapi headers.
...
We still need the 'aux' hack, but this is a good step forward.
Bug: 11559337
Change-Id: Ib3d79317293e1cd3d2620c38e6b472a5994ee554
2013-11-19 16:55:00 -08:00
Andrew Hsieh
8baaca5f97
Switch AOSP X86/MIPS compiler to gcc4.8
...
Change-Id: Ifeee2c7d696c8a8e96e52c6ca51434260bdae5f8
2013-11-15 10:25:58 +08:00
Ben Cheng
9a1f26e425
am 2e6753a0
: am de9b1835
: Merge "Switch AOSP ARM build to use GCC 4.8."
...
* commit '2e6753a058a766d7c0607437224470c14574a94e':
Switch AOSP ARM build to use GCC 4.8.
2013-11-14 14:14:22 -08:00
Ben Cheng
818d7d04f5
Switch AOSP ARM build to use GCC 4.8.
...
Change-Id: I65051773153ad5bc2c093cd1313acd212eb427b1
2013-11-14 14:05:29 -08:00
Ying Wang
a6b97cf42b
am e4ab2f96
: am 18b86b97
: am 77f27f1d
: Merge "Cleanup x86 and x86_64 flags"
...
* commit 'e4ab2f96082d1e3fa7bb8eab1f495a5d49f77bde':
Cleanup x86 and x86_64 flags
2013-11-13 22:18:18 -08:00
Ying Wang
e4ab2f9608
am 18b86b97
: am 77f27f1d
: Merge "Cleanup x86 and x86_64 flags"
...
* commit '18b86b97b83e7d254125723363f170bc6f8d391e':
Cleanup x86 and x86_64 flags
2013-11-13 21:02:17 -08:00
Ying Wang
77f27f1dbe
Merge "Cleanup x86 and x86_64 flags"
2013-11-14 04:54:55 +00:00
Elliott Hughes
06659afcdf
am 693a26ba
: am f8c5a6ae
: am bd10e2c0
: Merge "Switch x86_64 over to uapi headers."
...
* commit '693a26ba5599b84a3ae2a4b309e22be8a61ba3b0':
Switch x86_64 over to uapi headers.
2013-11-08 14:56:24 -08:00
Elliott Hughes
693a26ba55
am f8c5a6ae
: am bd10e2c0
: Merge "Switch x86_64 over to uapi headers."
...
* commit 'f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
Switch x86_64 over to uapi headers.
2013-11-08 14:54:12 -08:00
Elliott Hughes
bd10e2c019
Merge "Switch x86_64 over to uapi headers."
2013-11-08 22:50:55 +00:00
Elliott Hughes
600b973722
Switch x86_64 over to uapi headers.
...
Bug: 11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
2013-11-08 14:47:10 -08:00
Raphael Moll
6f1f97d970
am e9966aab
: am 79a9a324
: am 3342bf0f
: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
...
* commit 'e9966aab80e74d0a06c4ab6734a5996d8cb69604':
Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:42:20 -08:00