Dan Albert
7909ea9922
Never use ASAN for acp.
...
Since acp is needed to build the ASAN libs, we can't use ASAN to
instrument it. Since libhost is included statically in acp, we can't
instrument that either.
Change-Id: Idb389df945380b6ef447fc3d3ead8be27ec09011
2014-10-31 16:33:08 -07:00
Nick Kralevich
54e1837910
am 36084e64: Merge "Label goldfish block devices with their own types."
...
* commit '36084e64a1b603f0ca848bba5ca91938f853dc4c':
Label goldfish block devices with their own types.
2014-10-31 18:31:34 +00:00
Nick Kralevich
36084e64a1
Merge "Label goldfish block devices with their own types."
2014-10-31 18:27:18 +00:00
Stephen Smalley
2ef5bf74fa
Label goldfish block devices with their own types.
...
This assigns block device types as per device/generic/goldfish/fstab.goldfish.
Eliminates (permissive) avc: denied messages for fsck.
Change-Id: Ia72bdfb16975f051548b6b2c0636e4f907295789
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-10-31 14:19:55 -04:00
Nick Kralevich
4fe702e4dc
am dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
...
* commit 'dfa2f8a6e309bca516a11d83abd1aa8733acce69':
Mark qemu_device as a mlstrustedobject.
2014-10-31 17:36:28 +00:00
Nick Kralevich
dfa2f8a6e3
Merge "Mark qemu_device as a mlstrustedobject."
2014-10-31 17:30:15 +00:00
Stephen Smalley
968ce565f7
Mark qemu_device as a mlstrustedobject.
...
Allow apps running with any level to write to it.
Change-Id: I8fca1f377e14c624db5273bdacf8400addc6210d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-10-31 13:28:09 -04:00
Ying Wang
7f18adc240
am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
...
* commit '871b8df128b144f39d40889e463722a032c4d246':
Add -fcolor-diagnostics to global clang cflags.
2014-10-30 23:43:02 +00:00
Ying Wang
871b8df128
Merge "Add -fcolor-diagnostics to global clang cflags."
2014-10-30 21:18:03 +00:00
Ying Wang
c7d1a973b0
Add -fcolor-diagnostics to global clang cflags.
...
Bug: 18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
2014-10-30 12:22:29 -07: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
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
Jeff Davidson
ed9981d927
am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
...
* commit '427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
2014-10-29 17:40:05 +00:00
Jeff Davidson
427d1e98ec
Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
2014-10-29 17:35:17 +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
93cb8c7d95
Merge "Specify -mcpu=krait for clang."
2014-10-28 23:03:36 +00:00
Ian Rogers
e270873407
Specify -mcpu=krait for clang.
...
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
2014-10-28 15:50:02 -07:00
Andrew Boie
388c04dd6b
definitions.mk: look for definitions.mk in device/*/build also
...
build/core/Makefile looks for build tasks in either device/*/build/tasks
or vendor/*/build/tasks. Do the same with vendor-specific definitions.mk.
Change-Id: Ib4fd00a1d0effe8e347382a922da101ce26bf696
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-10-28 08:36:00 -07:00
Neil Fuller
acd65c7db0
am 97ef1d46: Merge "Add OpenJDK 8 experimental support"
...
* commit '97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
2014-10-28 04:50:49 +00:00
Chih-Hung Hsieh
736a146c3c
am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
...
* commit '717ebfc13182202ab38e17c0cd008924e9e5c4e9':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
2014-10-28 04:48:54 +00:00
Dan Albert
ef8912d93f
am d274e04a: Merge "Don\'t sort shared library link order."
...
* commit 'd274e04ac4317d7cfc2de02ca215e064c018c234':
Don't sort shared library link order.
2014-10-28 04:46:53 +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
Marcos Marado
a69822cb2b
Force colorsheme to SVG, since darkblue doesn't exist on X11
...
Change-Id: I1b9e13dd4ca63ba27a49a55d95130bdceb187669
2014-10-27 17:41:01 +00: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
54fd82d111
am 660f3c9a: Merge "Set default to Clang integrated assembler."
...
* commit '660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
Set default to Clang integrated assembler.
2014-10-24 13:02:00 +00:00
Neil Fuller
97ef1d46cd
Merge "Add OpenJDK 8 experimental support"
2014-10-24 08:16:04 +00:00
Chih-Hung Hsieh
717ebfc131
Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
2014-10-24 00:26:21 +00:00
Chih-Hung Hsieh
22b6c5c2c1
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
...
BUG: 18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
2014-10-23 16:39:09 -07:00
Dan Albert
d274e04ac4
Merge "Don't sort shared library link order."
2014-10-23 22:20:01 +00:00
Dan Albert
04eead7e2b
Don't sort shared library link order.
...
Only sort the list of shared libraries used for naming dependencies,
not the order they are actually linked in. The order in which shared
libraries appear to the linker affects which symbols get used if there
is a multiply defined symbol.
Also link system shared libraries _after_ user provided libraries,
since a user will want their functions to override the system's if
they exist.
Change-Id: I071059d940d40a648d69d90e0699073ef520138a
2014-10-23 14:04:02 -07:00
Chih-Hung Hsieh
ea503d21c7
Merge "Raise x86 arch requirement to prescott."
2014-10-23 20:47:30 +00:00
Jeff Davidson
b8ddd55b55
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
...
If a module is explicitly depending on a versioned protolib, we strip
the dependency and log a warning so the unneeded dependency can be
removed.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2014-10-23 07:20:16 -07:00
Neil Fuller
960f22c11d
Add OpenJDK 8 experimental support
...
Targeting 1.7: just adding support for the tools.
Various issues exist with OpenJDK 8: it doesn't build to completion
yet.
Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
2014-10-23 14:07:29 +01:00
Neil Fuller
4dfda1fa42
Merge "Remove Java 6 build support"
2014-10-23 09:00:15 +00:00
Bill Yi
4ac049b7ec
Restore AOSP-style version numbers - DO NOT MERGE
2014-10-22 15:44:51 -07: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
Chih-Hung Hsieh
660f3c9ae9
Merge "Set default to Clang integrated assembler."
2014-10-22 21:07:47 +00:00
Chih-Hung Hsieh
57c8a15edd
Set default to Clang integrated assembler.
...
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
2014-10-22 09:21:53 -07:00
Bill Yi
13466f0f79
Merge commit '66b3e31936b99436e01c473dca492126eea3e336' into HEAD
2014-10-22 08:45:57 -07:00
Ying Wang
c6a12d776a
am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
...
* commit '46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 13:12:13 +00:00
Neil Fuller
46e00ea4ba
Remove Java 6 build support
...
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Ying Wang
46ba24c4a0
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
2014-10-22 01:37:16 +00:00
Ying Wang
85f24a406b
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
...
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:36:43 -07:00
Ying Wang
f3e4b2c98e
am 18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
...
* commit '18cd02257d7045543ba435aa1efa497c8a780f27':
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
2014-10-21 20:20:56 +00:00
Ying Wang
18cd02257d
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
2014-10-21 19:19:16 +00:00
Ying Wang
24e03369cf
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
...
Previously ccache is disabled when it fails calling clang's preprocessor with
unused arguments (such as '-Wa,--noexecstack') in the command line.
See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html .
(-Qunused-arguments suppresses more than
-Wno-unused-command-line-argument does.)
Change-Id: I6cde307632c8395c053eb28063d7844d93070562
2014-10-20 17:21:16 -07:00
Adam Lesinski
66b3e31936
am 318217a8: Enable building of gtest for Windows
...
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
2014-10-21 00:01:15 +00:00
Adam Lesinski
318217a84a
Enable building of gtest for Windows
...
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.
Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
2014-10-20 16:06:44 -07:00
Dan Albert
96983cba42
am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."
...
* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
2014-10-20 22:42:11 +00:00
Dan Albert
cc0aa4dabd
am 28c265dd: Merge "We also need -rdynamic for host ASAN."
...
* commit '28c265ddddebeabc0597e976fbc817b70c46abc2':
We also need -rdynamic for host ASAN.
2014-10-20 22:36:45 +00:00