OSDN Git Service
Ian Rogers [Wed, 29 Oct 2014 19:43:16 +0000 (19:43 +0000)]
am
508e27bf: am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
508e27bfd7f470a945978c2b24403b0827dcde18':
Specify -mcpu=krait for clang.
Neil Fuller [Wed, 29 Oct 2014 17:11:52 +0000 (17:11 +0000)]
am
acd65c7d: am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
acd65c7db0212bff2b7b1878a26b7a105522cd44':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:51 +0000 (17:11 +0000)]
am
736a146c: am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
736a146c3c44b6b753e0b7866d3f0f43e9be76e5':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Wed, 29 Oct 2014 17:11:50 +0000 (17:11 +0000)]
am
ef8912d9: am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
Don't sort shared library link order.
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:49 +0000 (17:11 +0000)]
am
6555580d: am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
6555580d35ac570005923866fb4035265a0b5b98':
Raise x86 arch requirement to prescott.
Neil Fuller [Wed, 29 Oct 2014 17:11:24 +0000 (17:11 +0000)]
am
f7ce9508: am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
f7ce9508dec85c67d3a2ebe84db073a01355eba5':
Remove Java 6 build support
Chih-Hung Hsieh [Wed, 29 Oct 2014 16:42:52 +0000 (16:42 +0000)]
am
54fd82d1: am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
54fd82d111113c7969052cd315cc71bd31b4e161':
Set default to Clang integrated assembler.
Ian Rogers [Wed, 29 Oct 2014 12:32:37 +0000 (12:32 +0000)]
am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
Specify -mcpu=krait for clang.
Bill Yi [Wed, 29 Oct 2014 07:01:01 +0000 (07:01 +0000)]
am
4ac049b7: (-s ours) Restore AOSP-style version numbers - DO NOT MERGE
* commit '
4ac049b7ec188161dccf6fa9b1f23c76f8330857':
Restore AOSP-style version numbers - DO NOT MERGE
Ian Rogers [Tue, 28 Oct 2014 23:03:36 +0000 (23:03 +0000)]
Merge "Specify -mcpu=krait for clang."
Ian Rogers [Tue, 28 Oct 2014 22:50:02 +0000 (15:50 -0700)]
Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
Adam Lesinski [Tue, 28 Oct 2014 18:09:11 +0000 (18:09 +0000)]
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
Adam Lesinski [Tue, 28 Oct 2014 17:41:29 +0000 (17:41 +0000)]
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
Neil Fuller [Tue, 28 Oct 2014 04:50:49 +0000 (04:50 +0000)]
am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:48:54 +0000 (04:48 +0000)]
am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
717ebfc13182202ab38e17c0cd008924e9e5c4e9':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Tue, 28 Oct 2014 04:46:53 +0000 (04:46 +0000)]
am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
d274e04ac4317d7cfc2de02ca215e064c018c234':
Don't sort shared library link order.
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:46:49 +0000 (04:46 +0000)]
am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
Raise x86 arch requirement to prescott.
Ying Wang [Tue, 28 Oct 2014 03:36:22 +0000 (03:36 +0000)]
Store symbols.zip in apps_only build. automerge:
a60fb49
automerge:
a73b611
* commit '
a73b611e6b2a626b144170f15509e02f3318976e':
Store symbols.zip in apps_only build.
Ying Wang [Tue, 28 Oct 2014 00:15:59 +0000 (00:15 +0000)]
Store symbols.zip in apps_only build.
automerge:
a60fb49
* commit '
a60fb49704946b9d5cf0551ddd56bd1072131b85':
Store symbols.zip in apps_only build.
Adam Lesinski [Mon, 27 Oct 2014 21:26:35 +0000 (14:26 -0700)]
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
Ying Wang [Fri, 24 Oct 2014 18:36:59 +0000 (11:36 -0700)]
Store symbols.zip in apps_only build.
Bug:
18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
Neil Fuller [Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)]
am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
4dfda1fa4201e41022396b77054168ffc73b590c':
Remove Java 6 build support
Chih-Hung Hsieh [Fri, 24 Oct 2014 13:02:00 +0000 (13:02 +0000)]
am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
Set default to Clang integrated assembler.
Neil Fuller [Fri, 24 Oct 2014 08:16:03 +0000 (08:16 +0000)]
Merge "Add OpenJDK 8 experimental support"
JP Abgrall [Fri, 24 Oct 2014 03:24:41 +0000 (03:24 +0000)]
am
775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
automerge:
620e409
* commit '
620e409127c6b13d72211251a8a5e92513d04693':
core: Fixup bad ext4 mount options for recovery (pick common denominator)
JP Abgrall [Fri, 24 Oct 2014 02:57:34 +0000 (02:57 +0000)]
am
775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
* commit '
775b1abb12a5d891ac66b51d28381692bde6ab03':
core: Fixup bad ext4 mount options for recovery (pick common denominator)
Chih-Hung Hsieh [Fri, 24 Oct 2014 00:26:20 +0000 (00:26 +0000)]
Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
Chih-Hung Hsieh [Thu, 23 Oct 2014 23:39:09 +0000 (16:39 -0700)]
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
BUG:
18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
JP Abgrall [Thu, 23 Oct 2014 23:27:03 +0000 (16:27 -0700)]
core: Fixup bad ext4 mount options for recovery (pick common denominator)
Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.
Bug:
18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
Michael Runge [Thu, 23 Oct 2014 22:20:09 +0000 (22:20 +0000)]
am
46fe30ef: am
fb8886db: get_stage in updater takes one param, not two.
* commit '
46fe30eff7c66ce5ec8fd8d6b3aba91b55a5e12f':
get_stage in updater takes one param, not two.
JP Abgrall [Thu, 23 Oct 2014 22:20:08 +0000 (22:20 +0000)]
am
4f072e14: am
7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '
4f072e140bba2422eae14270f22174398a86a0ba':
core: Let the build specify mount options for recovery
Michael Runge [Thu, 23 Oct 2014 22:20:07 +0000 (22:20 +0000)]
am
10ba5654: am
7cd99bad: Allow info_dict from target_files to specify mount options
* commit '
10ba56543175590bdee9e6ab13c63c3ca8beb26b':
Allow info_dict from target_files to specify mount options
Dan Albert [Thu, 23 Oct 2014 22:20:01 +0000 (22:20 +0000)]
Merge "Don't sort shared library link order."
Michael Runge [Thu, 23 Oct 2014 21:57:12 +0000 (21:57 +0000)]
am
fb8886db: get_stage in updater takes one param, not two.
* commit '
fb8886db6858388af5082268fd023b8a44fb87ea':
get_stage in updater takes one param, not two.
JP Abgrall [Thu, 23 Oct 2014 21:57:11 +0000 (21:57 +0000)]
am
7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '
7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
core: Let the build specify mount options for recovery
Michael Runge [Thu, 23 Oct 2014 21:57:10 +0000 (21:57 +0000)]
am
7cd99bad: Allow info_dict from target_files to specify mount options
* commit '
7cd99bad210455dc57702b7cbf674a588a5eb028':
Allow info_dict from target_files to specify mount options
Dan Albert [Thu, 23 Oct 2014 21:04:02 +0000 (14:04 -0700)]
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
Michael Runge [Thu, 23 Oct 2014 20:51:04 +0000 (13:51 -0700)]
get_stage in updater takes one param, not two.
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
Chih-Hung Hsieh [Thu, 23 Oct 2014 20:47:29 +0000 (20:47 +0000)]
Merge "Raise x86 arch requirement to prescott."
Jeff Hamilton [Thu, 23 Oct 2014 20:28:21 +0000 (20:28 +0000)]
am
5069bd6b: Add a density axis to tapas.
* commit '
5069bd6bfa49c0f978ed47d44e0439b15b74cef5':
Add a density axis to tapas.
smain@google.com [Thu, 23 Oct 2014 20:28:20 +0000 (20:28 +0000)]
am
60e80ef6: am
f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit '
60e80ef6e7f6a05a654154d0f43bf31ebe8fdae3':
add helpouts script to <head>, behind a condition that can be enabled per page
Ying Wang [Thu, 23 Oct 2014 19:46:53 +0000 (19:46 +0000)]
am
9318a22f: am
b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '
9318a22f96dd1d4ffcae76fb20520a303ef10fdf':
Use the lowest common denominator 32-bit abi for arm64 cts build.
Jeff Hamilton [Fri, 5 Sep 2014 04:28:00 +0000 (21:28 -0700)]
Add a density axis to tapas.
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.
Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit
7e3d2341570681e566872216796dc4f79c8695ef)
JP Abgrall [Thu, 23 Oct 2014 18:15:56 +0000 (18:15 +0000)]
Merge "core: Let the build specify mount options for recovery" into lmp-dev
JP Abgrall [Thu, 23 Oct 2014 03:01:22 +0000 (20:01 -0700)]
core: Let the build specify mount options for recovery
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
# <fstype>=<fstype_opts>[|<fstype_opts>]...
# fstype_opts := <opt>[,<opt>]...
# opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""
The default is
"ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"
The release tools will pick them up with
https://googleplex-android-review.git.corp.google.com/#/c/573628
Bug:
18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
smain@google.com [Thu, 23 Oct 2014 16:34:39 +0000 (16:34 +0000)]
am
f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit '
f84e045e42f0377c415b2b6fea432ea0f3967f4f':
add helpouts script to <head>, behind a condition that can be enabled per page
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
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
Bill Yi [Thu, 23 Oct 2014 13:04:59 +0000 (13:04 +0000)]
Neil Fuller [Thu, 23 Oct 2014 09:00:13 +0000 (09:00 +0000)]
Merge "Remove Java 6 build support"
Ying Wang [Thu, 23 Oct 2014 03:18:55 +0000 (03:18 +0000)]
am
c6a12d77: am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
c6a12d776ae548c4290d76cb157807acb1ffb9f1':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Ying Wang [Thu, 23 Oct 2014 03:18:11 +0000 (03:18 +0000)]
am
f3e4b2c9: am
18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '
f3e4b2c98e91c073e7612adb7adb16530ba00c7b':
Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
Michael Runge [Thu, 23 Oct 2014 00:21:48 +0000 (17:21 -0700)]
Allow info_dict from target_files to specify mount options
This will allow safer mount options to be added per mount FS
type, to better ensure data is written during an OTA.
Bug:
18079773,
18092222
Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b
Ying Wang [Thu, 23 Oct 2014 00:14:19 +0000 (00:14 +0000)]
am
b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '
b6f60d57e3e5ccb89145cd2513a9a35077c025a5':
Use the lowest common denominator 32-bit abi for arm64 cts build.
smain@google.com [Wed, 22 Oct 2014 23:58:07 +0000 (23:58 +0000)]
Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
Bill Yi [Wed, 22 Oct 2014 22:44:51 +0000 (15:44 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:35:08 +0000 (14:35 -0700)]
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
Ying Wang [Wed, 22 Oct 2014 21:28:02 +0000 (21:28 +0000)]
am
e3fe9cf2: am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
e3fe9cf21383b0444037358eaf2f207d94a560f2':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:07:47 +0000 (21:07 +0000)]
Merge "Set default to Clang integrated assembler."
Ying Wang [Wed, 22 Oct 2014 20:47:46 +0000 (20:47 +0000)]
am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
smain@google.com [Tue, 21 Oct 2014 20:57:01 +0000 (13:57 -0700)]
add helpouts script to <head>, behind a condition that can be enabled per page
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
Chih-Hung Hsieh [Wed, 22 Oct 2014 16:21:53 +0000 (09:21 -0700)]
Set default to Clang integrated assembler.
BUG:
17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
Bill Yi [Wed, 22 Oct 2014 15:45:57 +0000 (08:45 -0700)]
Clay Murphy [Wed, 22 Oct 2014 15:34:34 +0000 (15:34 +0000)]
am
238964e1: am
f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit '
238964e1e22df2be4c2c193867c4c0300b5f3a38':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Wed, 22 Oct 2014 14:53:29 +0000 (14:53 +0000)]
am
f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit '
f7b231b7a64c2ab953c9f4a2eb5390f0b3a2f296':
Docs: Making source.android.com headers match those of developer.android.com
Ying Wang [Wed, 22 Oct 2014 13:12:13 +0000 (13:12 +0000)]
am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
Ying Wang [Wed, 22 Oct 2014 04:20:41 +0000 (21:20 -0700)]
Use the lowest common denominator 32-bit abi for arm64 cts build.
So the 32-bit code can be run any supported 32-bit arm devices.
Bug:
18038310
Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b
Ying Wang [Wed, 22 Oct 2014 01:37:15 +0000 (01:37 +0000)]
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Tue, 21 Oct 2014 20:20:56 +0000 (20:20 +0000)]
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.
Ying Wang [Tue, 21 Oct 2014 19:19:15 +0000 (19:19 +0000)]
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
Clay Murphy [Fri, 3 Oct 2014 21:58:50 +0000 (14:58 -0700)]
Docs: Making source.android.com headers match those of developer.android.com
Bug:
17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
Adam Lesinski [Tue, 21 Oct 2014 16:53:47 +0000 (16:53 +0000)]
am
ea24f794: am
318217a8: Enable building of gtest for Windows
* commit '
ea24f7947969a874cd4039e66af116ae655ea140':
Enable building of gtest for Windows
Adam Lesinski [Tue, 21 Oct 2014 16:40:56 +0000 (16:40 +0000)]
am
318217a8: Enable building of gtest for Windows
* commit '
318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Ying Wang [Tue, 21 Oct 2014 00:51:50 +0000 (17:51 -0700)]
resolved conflicts for merge of
3a2b9f0a to lmp-mr1-dev-plus-aosp
Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
Naseer Ahmed [Thu, 16 Oct 2014 17:17:12 +0000 (13:17 -0400)]
core: OSX: Support 10.9 SDK as well
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
Ying Wang [Fri, 17 Oct 2014 22:07:24 +0000 (15:07 -0700)]
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
Adam Lesinski [Tue, 21 Oct 2014 00:01:15 +0000 (00:01 +0000)]
am
318217a8: Enable building of gtest for Windows
* commit '
318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Adam Lesinski [Mon, 20 Oct 2014 23:06:44 +0000 (16:06 -0700)]
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
Dan Albert [Mon, 20 Oct 2014 22:42:23 +0000 (22:42 +0000)]
am
cc0aa4da: am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:42:11 +0000 (22:42 +0000)]
am
cc0aa4da: am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:36:45 +0000 (22:36 +0000)]
am
28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit '
28c265ddddebeabc0597e976fbc817b70c46abc2':
We also need -rdynamic for host ASAN.
Dan Albert [Mon, 20 Oct 2014 22:33:49 +0000 (22:33 +0000)]
Merge "We also need -rdynamic for host ASAN."
Dan Albert [Mon, 20 Oct 2014 20:30:00 +0000 (13:30 -0700)]
We also need -rdynamic for host ASAN.
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
Dan Albert [Mon, 20 Oct 2014 20:38:43 +0000 (13:38 -0700)]
resolved conflicts for merge of
96c22133 to lmp-mr1-dev-plus-aosp
Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34
Dan Albert [Mon, 20 Oct 2014 20:37:18 +0000 (13:37 -0700)]
resolved conflicts for merge of
96c22133 to lmp-dev-plus-aosp
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
Dan Albert [Mon, 20 Oct 2014 20:28:43 +0000 (20:28 +0000)]
am
1f134dd0: Merge "Add support for ASAN in host modules."
* commit '
1f134dd06cd12f032c833b9a43b476a9557fa8da':
Add support for ASAN in host modules.
Dan Albert [Mon, 20 Oct 2014 20:24:07 +0000 (20:24 +0000)]
Merge "Add support for ASAN in host modules."
Dan Albert [Mon, 20 Oct 2014 18:37:18 +0000 (11:37 -0700)]
Add support for ASAN in host modules.
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
Stephen Hines [Mon, 20 Oct 2014 18:30:27 +0000 (18:30 +0000)]
am
7d86749d: am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:30:08 +0000 (18:30 +0000)]
am
7d86749d: am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
7d86749da7033dcf230ceb67f9ae0cd676441e4d':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:19:25 +0000 (18:19 +0000)]
am
ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '
ed8206dba48e182f786ec677d56586ffaf973250':
Remove unnecessary 10.8-specific build rules
Stephen Hines [Mon, 20 Oct 2014 18:06:34 +0000 (18:06 +0000)]
Merge "Remove unnecessary 10.8-specific build rules"
Dan Albert [Sat, 18 Oct 2014 02:42:35 +0000 (02:42 +0000)]
am
ec28a489: am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 02:42:07 +0000 (02:42 +0000)]
am
ec28a489: am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 02:25:40 +0000 (02:25 +0000)]
am
28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '
28c2d3b9852550bc9ae150e2725e08885f1ade73':
Fix breakage for x86_64 static executables.
Dan Albert [Sat, 18 Oct 2014 01:05:36 +0000 (01:05 +0000)]
Merge "Fix breakage for x86_64 static executables."
Stephen Hines [Sat, 18 Oct 2014 00:36:42 +0000 (17:36 -0700)]
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
Dan Albert [Fri, 17 Oct 2014 23:58:38 +0000 (16:58 -0700)]
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