OSDN Git Service
Jiyong Park [Fri, 14 Jul 2017 22:23:17 +0000 (22:23 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am:
b1c3da1d89 am:
510d9236dd
am:
89db25a0a0
Change-Id: Id2d0206490dca5ed0b971bd11adc146a1fffe86b
Jiyong Park [Fri, 14 Jul 2017 22:19:14 +0000 (22:19 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am:
b1c3da1d89
am:
510d9236dd
Change-Id: I31c4f6a26932e9f6564704a82016a629483a3d5b
Jiyong Park [Fri, 14 Jul 2017 22:15:53 +0000 (22:15 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients"
am:
b1c3da1d89
Change-Id: Ib34c688064d470a5f7fe546013bae0a83985d66a
Treehugger Robot [Fri, 14 Jul 2017 22:09:50 +0000 (22:09 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients"
Elliott Hughes [Fri, 14 Jul 2017 19:02:42 +0000 (19:02 +0000)]
Merge "libm symbol cleanup." am:
4ebed99e25 am:
8d21ab4fda
am:
3cefa966ef
Change-Id: I8f408ca57cabc94da60296e131c99cb78fa3de2d
Elliott Hughes [Fri, 14 Jul 2017 18:59:11 +0000 (18:59 +0000)]
Merge "libm symbol cleanup." am:
4ebed99e25
am:
8d21ab4fda
Change-Id: I8b7d3451e165e7d696cbaa9a3f314f909c3d6b0f
Elliott Hughes [Fri, 14 Jul 2017 18:55:42 +0000 (18:55 +0000)]
Merge "libm symbol cleanup."
am:
4ebed99e25
Change-Id: I1019918ae9598c91300749619a90fddb74796b64
Treehugger Robot [Fri, 14 Jul 2017 18:51:03 +0000 (18:51 +0000)]
Merge "libm symbol cleanup."
Elliott Hughes [Fri, 14 Jul 2017 00:30:06 +0000 (17:30 -0700)]
libm symbol cleanup.
Some of this code is used in the NDK libandroid_support now, as a static
library, so just being HIDDEN in the ELF sense isn't sufficient.
Rename digittoint to __libm_digittoint so we don't trample anyone's toes.
Also remove imprecise_powl and imprecise_tgammal. It turns out (to my
surprise) that we don't even have ld128 implementations of powl and tgammal,
so even LP64 was just using the "fake_long_double.c" hack in effect. Since
that's the case, let's *actually* do that because then we're not polluting
with the internal names in addition to the aliases.
Bug: N/A
Test: readelf
Change-Id: I273cc8fdc7ce53f9b8dfd4ef7796e358fe901837
Elliott Hughes [Thu, 13 Jul 2017 19:39:57 +0000 (19:39 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test." am:
03e9c498d4 am:
5a99bd4ea7
am:
1e4853a6df
Change-Id: I0cbe6646ff90d037e5af482acd5666a9c37a9564
Dan Albert [Thu, 13 Jul 2017 19:39:44 +0000 (19:39 +0000)]
Merge "Move wchar _l functions out of wchar.cpp." am:
78c8b306ee am:
021d7ca543
am:
aa47998465
Change-Id: Ib946f3cf772a7cd51dda1462ee92fd9959fe7b1d
Elliott Hughes [Thu, 13 Jul 2017 19:32:55 +0000 (19:32 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test." am:
03e9c498d4
am:
5a99bd4ea7
Change-Id: Ib3afe4345722a39f96cbc0084fc579e2d3d6997b
Dan Albert [Thu, 13 Jul 2017 19:32:42 +0000 (19:32 +0000)]
Merge "Move wchar _l functions out of wchar.cpp." am:
78c8b306ee
am:
021d7ca543
Change-Id: Ie09981f2021f77a32491640f84d85cc4ff39fecb
Elliott Hughes [Thu, 13 Jul 2017 19:27:58 +0000 (19:27 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test."
am:
03e9c498d4
Change-Id: I751bc797ae578760664b51859c7b9a1711709adb
Dan Albert [Thu, 13 Jul 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Move wchar _l functions out of wchar.cpp."
am:
78c8b306ee
Change-Id: Ia871cf273fde5c70737378b0a7634f2a634d5587
Treehugger Robot [Thu, 13 Jul 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test."
Treehugger Robot [Thu, 13 Jul 2017 19:21:11 +0000 (19:21 +0000)]
Merge "Move wchar _l functions out of wchar.cpp."
Dan Albert [Thu, 13 Jul 2017 17:29:20 +0000 (10:29 -0700)]
Move wchar _l functions out of wchar.cpp.
We don't need these in libandroid_support, but we do need the other
parts of wchar.cpp, and they're not really related.
Test: make checkbuild
Bug: None
Change-Id: I40f3089b034abfd4873e81c0b6216a7cfd977d8d
Elliott Hughes [Thu, 13 Jul 2017 17:20:41 +0000 (10:20 -0700)]
Fix unistd._POSIX_macros_smoke test.
We now claim _POSIX2_VERSION, but the test wasn't updated.
Bug: N/A
Test: ran tests
Change-Id: Idb3369b3df4b964f585597f0d37962ae619322d2
Dan Albert [Thu, 13 Jul 2017 08:42:34 +0000 (08:42 +0000)]
Merge changes from topic 'locale-android-support' am:
2d585e0070 am:
5f78abdbd8
am:
c3f90fb45a
Change-Id: Ib3bedde420933002f992f9c9e0e24d9ddd5047ae
Dan Albert [Thu, 13 Jul 2017 08:40:04 +0000 (08:40 +0000)]
Merge changes from topic 'locale-android-support' am:
2d585e0070
am:
5f78abdbd8
Change-Id: I3716fa367e78b41548c75b7fdb7bf9c68ffb9173
Dan Albert [Thu, 13 Jul 2017 08:37:05 +0000 (08:37 +0000)]
Merge changes from topic 'locale-android-support'
am:
2d585e0070
Change-Id: I993d7f4c2bd448aa11f0ad30d6db4cba625cb590
Dan Albert [Thu, 13 Jul 2017 08:34:57 +0000 (08:34 +0000)]
Merge changes from topic 'locale-android-support'
* changes:
Add a non-TLS slot implementation of locale.cpp.
Move non-locale.h APIs out of locale.cpp.
Christopher Ferris [Thu, 13 Jul 2017 06:22:56 +0000 (06:22 +0000)]
Merge "Really fix the mac build." am:
ada33eb9b4 am:
a95aade379
am:
8259929a3d
Change-Id: Iafa1539afdd28b1721afdea11c90201fd3a88fb4
Christopher Ferris [Thu, 13 Jul 2017 06:20:25 +0000 (06:20 +0000)]
Merge "Really fix the mac build." am:
ada33eb9b4
am:
a95aade379
Change-Id: I737b32cb43842c859bd7fc4eec7c5b7ab390b511
Christopher Ferris [Thu, 13 Jul 2017 06:17:26 +0000 (06:17 +0000)]
Merge "Really fix the mac build."
am:
ada33eb9b4
Change-Id: I131c705329ac3c85509c677a8b0caf3b08cf78b4
Christopher Ferris [Thu, 13 Jul 2017 06:13:14 +0000 (06:13 +0000)]
Merge "Really fix the mac build."
Christopher Ferris [Thu, 13 Jul 2017 06:10:07 +0000 (23:10 -0700)]
Really fix the mac build.
I forgot an underscore.
Test: Builds.
Change-Id: Ib7da13dea315822af89c53a569fb0a0c2fd5d321
Christopher Ferris [Thu, 13 Jul 2017 04:39:50 +0000 (04:39 +0000)]
Merge "Fix max build." am:
b1e4cc31a4 am:
3b33f6f9c1
am:
ccf5bfe492
Change-Id: I5824183eb48f254f435a3094e12b225a4279bbff
Christopher Ferris [Thu, 13 Jul 2017 04:37:20 +0000 (04:37 +0000)]
Merge "Fix max build." am:
b1e4cc31a4
am:
3b33f6f9c1
Change-Id: I26a4c1d1d7883c45b941c6c2cc1d3f1a4cf3d796
Christopher Ferris [Thu, 13 Jul 2017 04:34:49 +0000 (04:34 +0000)]
Merge "Fix max build."
am:
b1e4cc31a4
Change-Id: I9862bab5128a1854aa39c1ed0ef762a582d40eb6
Treehugger Robot [Thu, 13 Jul 2017 04:32:33 +0000 (04:32 +0000)]
Merge "Fix max build."
Christopher Ferris [Thu, 13 Jul 2017 02:33:32 +0000 (19:33 -0700)]
Fix max build.
Test: Built properly.
Change-Id: I37b8ac7d42653617be6611b640a883066257214c
Jiyong Park [Fri, 30 Jun 2017 06:36:12 +0000 (15:36 +0900)]
__cfi_slowpath[_diag] are available to NDK and VNDK clients
When a vendor lib (or vendor-available platform lib) is built with
sanitizer on, __cfi_slowpath_diag is required. However, when building
for those libs, the llndk stub of libdl.so is provided for them and
__cfi_slowpath_diag is not exposed to the stub. In order to make the
sanitizing build successful, expose the symbol.
These symbols are also exposed to NDK clients since we may want to CFI
for unbundled apps.
Bug:
63053790
Bug:
63342219
Test: BOARD_VNDK_VERSION=current m -j libstagefright_foundation.vendor
Change-Id: I081deddb4f66354aaecec4b395d4e17e5566c578
Christopher Ferris [Wed, 12 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp" am:
61b7e114dd am:
635d055914
am:
83edf6a849
Change-Id: Ib17426b083e35c97587511e27351eb902991c00a
Christopher Ferris [Wed, 12 Jul 2017 23:08:28 +0000 (23:08 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp" am:
61b7e114dd
am:
635d055914
Change-Id: I21f4e20118e02c24f3d761aad7aab19a193fb1d1
Christopher Ferris [Wed, 12 Jul 2017 23:05:36 +0000 (23:05 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp"
am:
61b7e114dd
Change-Id: I9d30d388d564078169bb89412e27407eeb475962
Christopher Ferris [Wed, 12 Jul 2017 22:56:13 +0000 (22:56 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp"
Dan Albert [Wed, 12 Jul 2017 20:47:42 +0000 (13:47 -0700)]
Add a non-TLS slot implementation of locale.cpp.
libandroid_support shouldn't be using Bionic's TLS slot. Add a
thread_local based implementation. We can't use the thread_local
implementation in bionic because the linker needs this and pthread
thread-locals (which is how thread_local is implemented) doesn't work
that early.
Test: make checkbuild
Test: adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
Bug: https://github.com/android-ndk/ndk/issues/300
Change-Id: I7dcbf554ade2264d541d722fa3f86df04926e67a
Anders Lewis [Fri, 23 Jun 2017 22:53:59 +0000 (15:53 -0700)]
Support memory alignment tests for string_benchmark.cpp
Test: Manually verify that benchmark times are similar and add a unit test.
Change-Id: Idaaeb4c8c3629f797ffd8d0c86c8d7b7b9653181
Dan Albert [Tue, 11 Jul 2017 21:27:07 +0000 (14:27 -0700)]
Move non-locale.h APIs out of locale.cpp.
libandroid_support only needs the locale.h stuff.
Test: make checkbuild
Bug: None
Change-Id: I0c53fe9d2df4f9ff4b99771727034508bc89cb32
Elliott Hughes [Tue, 11 Jul 2017 21:51:08 +0000 (21:51 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff." am:
3537331942 am:
3c2f2d9685
am:
6595225696
Change-Id: I8da0b1fd06a5131a93dbc97227e61ce507279c39
Elliott Hughes [Tue, 11 Jul 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff." am:
3537331942
am:
3c2f2d9685
Change-Id: I5002a0d4b049fabada7bfb6b1cbfc9f675c7907f
Elliott Hughes [Tue, 11 Jul 2017 21:44:08 +0000 (21:44 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff."
am:
3537331942
Change-Id: Ibfeadde43d1a0aa446c73f94df9896165c5bcd04
Treehugger Robot [Tue, 11 Jul 2017 21:34:08 +0000 (21:34 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff."
Elliott Hughes [Tue, 11 Jul 2017 19:34:19 +0000 (12:34 -0700)]
Sync with upstream OpenBSD: trivial stuff.
No active ingredient to any of these changes.
Bug: N/A
Test: builds
Change-Id: Ib1191a5c2826da024245d03dfc57557c8903a6cc
Elliott Hughes [Tue, 11 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "The future passed part of <stdlib.h> by..." am:
61fcd39e17 am:
a54fc4ecc8
am:
ca694f8855
Change-Id: Ib976b4db7685f3496d60b88f22c6ea3d1f87fc06
Elliott Hughes [Tue, 11 Jul 2017 19:05:27 +0000 (19:05 +0000)]
Merge "The future passed part of <stdlib.h> by..." am:
61fcd39e17
am:
a54fc4ecc8
Change-Id: I819b9886b568822a6178486ea0fe50944cb2d82f
Elliott Hughes [Tue, 11 Jul 2017 19:01:57 +0000 (19:01 +0000)]
Merge "The future passed part of <stdlib.h> by..."
am:
61fcd39e17
Change-Id: I74d796c9fb0d69a1a1242ba78aef9bb5308c4be9
Treehugger Robot [Tue, 11 Jul 2017 18:54:24 +0000 (18:54 +0000)]
Merge "The future passed part of <stdlib.h> by..."
dimitry [Tue, 11 Jul 2017 17:54:51 +0000 (17:54 +0000)]
Merge "Properly handle elf-files without relocation sections" am:
fc544af6cb am:
ea793e88ab
am:
14799b1bdf
Change-Id: I84222341b39637fbfb8f63a3f16439f59d87edcc
dimitry [Tue, 11 Jul 2017 17:51:22 +0000 (17:51 +0000)]
Merge "Properly handle elf-files without relocation sections" am:
fc544af6cb
am:
ea793e88ab
Change-Id: Iebf7acdfc3067adb7a22b309f94cdcac202cdcc1
dimitry [Tue, 11 Jul 2017 17:48:22 +0000 (17:48 +0000)]
Merge "Properly handle elf-files without relocation sections"
am:
fc544af6cb
Change-Id: I653c388e25904800aaba516fd4a7c6118292d7c9
Treehugger Robot [Tue, 11 Jul 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Properly handle elf-files without relocation sections"
dimitry [Tue, 11 Jul 2017 14:51:45 +0000 (16:51 +0200)]
Properly handle elf-files without relocation sections
Relocation packer no longer complains about missing
relocation sections.
Test: relocation-packer-unit-tests
Test: mm
Change-Id: I56814be326c15e046db1a96d14568d951f689ae2
Pavel Labath [Tue, 11 Jul 2017 08:24:18 +0000 (08:24 +0000)]
Merge "sys_ptrace_test: Better detect missing HW support" am:
fbefc86310 am:
8431285728
am:
7a8750cb87
Change-Id: I100ce23d5a373398e1ed233e0bc7bf071a1a0c24
Pavel Labath [Tue, 11 Jul 2017 08:20:47 +0000 (08:20 +0000)]
Merge "sys_ptrace_test: Better detect missing HW support" am:
fbefc86310
am:
8431285728
Change-Id: I49bd38960285f5522fcaa4c29ee5dc9da405b5b3
Pavel Labath [Tue, 11 Jul 2017 08:17:17 +0000 (08:17 +0000)]
Merge "sys_ptrace_test: Better detect missing HW support"
am:
fbefc86310
Change-Id: Idd43ea10d7e91353e33ff9efe0531eed64bd1a31
Treehugger Robot [Tue, 11 Jul 2017 08:10:41 +0000 (08:10 +0000)]
Merge "sys_ptrace_test: Better detect missing HW support"
Victor Khimenko [Mon, 10 Jul 2017 23:00:13 +0000 (23:00 +0000)]
Merge "Move environ valiable into it's own file" am:
73d17e7720 am:
ea426865a8
am:
2b5964ff0e
Change-Id: Ia860b0ce04ceb1ea457ad129f3a44a6c53f98f30
Victor Khimenko [Mon, 10 Jul 2017 22:53:44 +0000 (22:53 +0000)]
Merge "Move environ valiable into it's own file" am:
73d17e7720
am:
ea426865a8
Change-Id: I2196f236f7e4509316b41d42d75782f8ea7b1be1
Victor Khimenko [Mon, 10 Jul 2017 22:46:44 +0000 (22:46 +0000)]
Merge "Move environ valiable into it's own file"
am:
73d17e7720
Change-Id: I9b9533f7e3a70aa5b1e917953b51cc73d7881f32
Victor Khimenko [Mon, 10 Jul 2017 22:33:54 +0000 (22:33 +0000)]
Merge "Move environ valiable into it's own file"
Elliott Hughes [Mon, 10 Jul 2017 20:59:34 +0000 (20:59 +0000)]
Merge "Make inline tcsetattr definition match constants." am:
e76ff925df am:
0969d4609c
am:
21e4ac5c67
Change-Id: I8776360eee245de61fb624641220f8dabe131dc9
Elliott Hughes [Mon, 10 Jul 2017 20:55:04 +0000 (20:55 +0000)]
Merge "Make inline tcsetattr definition match constants." am:
e76ff925df
am:
0969d4609c
Change-Id: Iba2c172cc6add7025ef16f6607bed7e7adfcc2c9
Elliott Hughes [Mon, 10 Jul 2017 20:50:34 +0000 (20:50 +0000)]
Merge "Make inline tcsetattr definition match constants."
am:
e76ff925df
Change-Id: Ia6a48c54ac793c510ff2ab5559b920dd84ff02b9
Elliott Hughes [Mon, 10 Jul 2017 20:40:53 +0000 (20:40 +0000)]
Merge "Make inline tcsetattr definition match constants."
Elliott Hughes [Mon, 10 Jul 2017 20:34:03 +0000 (20:34 +0000)]
Merge "Undo recent _FILE_OFFSET_BITS=64 changes." am:
6aaa227f74 am:
25965c44f3
am:
56605aa725
Change-Id: Ifc8438e33fa2983146a17d1d67c4f841c6d10ff9
Elliott Hughes [Mon, 10 Jul 2017 20:30:02 +0000 (20:30 +0000)]
Merge "Undo recent _FILE_OFFSET_BITS=64 changes." am:
6aaa227f74
am:
25965c44f3
Change-Id: I91fc5506fba32fc2261914fbab61101ec6de234c
Elliott Hughes [Mon, 10 Jul 2017 20:26:33 +0000 (20:26 +0000)]
Merge "Undo recent _FILE_OFFSET_BITS=64 changes."
am:
6aaa227f74
Change-Id: I5f0cb54e6fa4067b33f8f76a3102263ef7ad5181
Elliott Hughes [Mon, 10 Jul 2017 20:22:01 +0000 (20:22 +0000)]
Merge "Fix ffs on x86 for old API levels." am:
c2828b87ec am:
3127168bba
am:
d93127bf90
Change-Id: I5144b29ecfdbcb75f30bfffbc261db260f3ea221
Treehugger Robot [Mon, 10 Jul 2017 20:20:53 +0000 (20:20 +0000)]
Merge "Undo recent _FILE_OFFSET_BITS=64 changes."
Elliott Hughes [Mon, 10 Jul 2017 20:17:32 +0000 (20:17 +0000)]
Merge "Fix ffs on x86 for old API levels." am:
c2828b87ec
am:
3127168bba
Change-Id: I91c03ebff777d2552621b4e0e43e27085ab62080
Elliott Hughes [Mon, 10 Jul 2017 20:13:32 +0000 (20:13 +0000)]
Merge "Fix ffs on x86 for old API levels."
am:
c2828b87ec
Change-Id: I9cb1cfc44be390d4675795359986bba0ed4a02c9
Treehugger Robot [Mon, 10 Jul 2017 20:07:01 +0000 (20:07 +0000)]
Merge "Fix ffs on x86 for old API levels."
Elliott Hughes [Wed, 5 Jul 2017 22:23:50 +0000 (15:23 -0700)]
Undo recent _FILE_OFFSET_BITS=64 changes.
We had several bugs filed saying "if I set _FILE_OFFSET_BITS=64 when
targeting an API < L, various functions are missing". Instead of
saying "yes, they are", we quietly just modified the header files to
expose the non-64-bit variants. This makes no sense. We can't just say
"oh, yeah, we don't have a version of this function that agrees with
your calling code about how large off_t is, but here's a version that
doesn't: I'm sure it'll be fine".
_FILE_OFFSET_BITS=64 on Android LP32 has always been a game of chance,
but that game should be "are all the functions my code needs available
at compile time?", not "will my code actually work at run time?".
Bug: https://github.com/android-ndk/ndk/issues/449
Bug: https://github.com/android-ndk/ndk/issues/442
Bug: https://github.com/android-ndk/ndk/issues/333
Bug: https://github.com/android-ndk/ndk/issues/332
Bug: https://github.com/android-ndk/ndk/issues/324
Test: builds
Change-Id: Ib095251d3e21e77ed50cc3575388107fecec4ecd
Victor Khimenko [Mon, 10 Jul 2017 19:15:37 +0000 (21:15 +0200)]
Move environ valiable into it's own file
Test: build statically the example program below
char** environ;
int main() {
}
Change-Id: I3f01652da1d5063d92ba7cbff7fb09bd0a89325c
Elliott Hughes [Mon, 10 Jul 2017 18:51:00 +0000 (11:51 -0700)]
The future passed part of <stdlib.h> by...
Bug: N/A
Test: builds
Change-Id: Ibac3c1abd82838dccd360cb70decb7083401c28e
Pavel Labath [Fri, 7 Jul 2017 10:42:34 +0000 (11:42 +0100)]
sys_ptrace_test: Better detect missing HW support
If the hardware debug support is missing from the CPU, the kernel can
end up in the state where it reports that it supports N(>0) watchpoints,
but the "maximum supported watchpoint size" is zero.
This is not a really sensible API, but it is what we have. I'm going to
speak to folks upstream about whether we can have it report something
more sensible, but that will take a while (if ever).
So, for the time being, detect this situation and treat it as if no
hardware watchtpoints/breakpoints are supported.
Test: bionic-unit-tests --gtest_filter="sys_ptrace.*"
Change-Id: Id6a013c9bec8d8b450b4a36c28431f6b7fd15879
Bug:
63116544
Ivan Lozano [Fri, 7 Jul 2017 20:17:19 +0000 (20:17 +0000)]
Merge "Disable integer_overflow sanitizer in libm." am:
ddefae7ba9 am:
cd52d02c53
am:
65437ac030
Change-Id: Id77be87ad611adbe8a4289d80acf2ca359aa9618
Ivan Lozano [Fri, 7 Jul 2017 20:14:52 +0000 (20:14 +0000)]
Merge "Disable integer_overflow sanitizer in libm." am:
ddefae7ba9
am:
cd52d02c53
Change-Id: I54ceea13489baa2ab9e2163f46bc3e73dd5a0cf3
Ivan Lozano [Fri, 7 Jul 2017 20:12:49 +0000 (20:12 +0000)]
Merge "Disable integer_overflow sanitizer in libm."
am:
ddefae7ba9
Change-Id: Ib2a6529ba4390d62d6b0c103da8bd43bb3a8ce92
Ivan Lozano [Fri, 7 Jul 2017 20:07:20 +0000 (20:07 +0000)]
Merge "Disable integer_overflow sanitizer in libm."
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:55 +0000 (22:42 +0000)]
Merge "Merge "Support building binutils out of the box for x86/x86-64." am:
6c716a155d am:
8f5078a1fb am:
e4e3ad5f81" into oc-dr1-dev-plus-aosp
Elliott Hughes [Thu, 6 Jul 2017 22:42:46 +0000 (22:42 +0000)]
Merge "Support building binutils out of the box for x86/x86-64." am:
6c716a155d am:
8f5078a1fb
am:
e4e3ad5f81
Change-Id: Iad3966fd18229e6875d1ae904008590d205679ee
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:40 +0000 (22:42 +0000)]
Merge "Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp am:
bb7ee40d4f" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:39 +0000 (22:42 +0000)]
Merge "Merge "Support building binutils out of the box for x86/x86-64." am:
6c716a155d am:
8f5078a1fb am:
e4e3ad5f81" into oc-dr1-dev-plus-aosp
Elliott Hughes [Thu, 6 Jul 2017 22:42:32 +0000 (22:42 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp
am:
bb7ee40d4f
Change-Id: Ibeaf78b0418eaaf59a06e9f94eda5a92ed24712c
Elliott Hughes [Thu, 6 Jul 2017 22:42:32 +0000 (22:42 +0000)]
Merge "Support building binutils out of the box for x86/x86-64." am:
6c716a155d am:
8f5078a1fb
am:
e4e3ad5f81
Change-Id: I742abf7744e067c08ef80910be903e01251b8425
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:27 +0000 (22:42 +0000)]
Merge "Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp am:
bb7ee40d4f" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:25 +0000 (22:42 +0000)]
Merge "Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp am:
7d2d6d7834" into oc-dr1-dev-plus-aosp
Elliott Hughes [Thu, 6 Jul 2017 22:42:20 +0000 (22:42 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp
am:
bb7ee40d4f
Change-Id: I15dc0c8d43f13e21d2c1785d2bcac4b6079a8439
Elliott Hughes [Thu, 6 Jul 2017 22:42:18 +0000 (22:42 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp
am:
7d2d6d7834
Change-Id: Id586817b7516e2c2fe645dfd5f18947a412e6665
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:12 +0000 (22:42 +0000)]
Merge "Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp am:
7d2d6d7834" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 22:42:09 +0000 (22:42 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a am:
e716af709d" into oc-dev-plus-aosp am:
58be397044" into oc-dr1-dev-plus-aosp
Elliott Hughes [Thu, 6 Jul 2017 22:42:04 +0000 (22:42 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a" into stage-aosp-master am:
9bd321eaa3" into oc-dev-plus-aosp
am:
7d2d6d7834
Change-Id: Ifcabca6f2a5e328a7aad75c93465fec5f8683fd3
Elliott Hughes [Thu, 6 Jul 2017 22:42:01 +0000 (22:42 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a am:
e716af709d" into oc-dev-plus-aosp
am:
58be397044
Change-Id: I2548a98a2cb708bed6d755f0bf486e76be8429c1
Elliott Hughes [Thu, 6 Jul 2017 22:41:49 +0000 (22:41 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a am:
e716af709d" into oc-dev-plus-aosp
am:
58be397044
Change-Id: I44925a6d40bbaf14f5b43e005c0aa01b2c2c9bf1
Elliott Hughes [Thu, 6 Jul 2017 22:41:33 +0000 (22:41 +0000)]
Merge "Make <sys/ttydefaults.h> more usable." am:
1de6d0bb8a am:
e716af709d
am:
9c7bd74f56
Change-Id: I66c9744fb6343a958e4620aa3aeecc75dac76af9
Elliott Hughes [Thu, 6 Jul 2017 22:41:16 +0000 (22:41 +0000)]
Merge "Update <arpa/*> from FreeBSD." am:
0ff813fb48 am:
05ebd700a5
am:
72450655e1
Change-Id: Ie837cb35557149987e2ae0dfc0fbfe57f61fc28d