OSDN Git Service

android-x86/bionic.git
7 years agoMerge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c58...
Josh Gao [Fri, 2 Sep 2016 08:58:35 +0000 (08:58 +0000)]
Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c5810 am: d644eda326
am: 2f473a56e6

Change-Id: I287e6ee3b30eb8ccb32ee6b97555ac7037e81cb4

7 years agoMerge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c5810
Josh Gao [Fri, 2 Sep 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c5810
am: d644eda326

Change-Id: I372e1ed0093388be7d51bd137274679e5425d9f9

7 years agoMerge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba
Josh Gao [Fri, 2 Sep 2016 08:52:05 +0000 (08:52 +0000)]
Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba
am: 1e424c5810

Change-Id: I53c276cf644bc87344eaa51c79c10fa016e17d60

7 years agoMerge "Revert "Update getentropy_linux.c from upstream.""
Josh Gao [Fri, 2 Sep 2016 08:49:07 +0000 (08:49 +0000)]
Merge "Revert "Update getentropy_linux.c from upstream.""
am: 9f798246ba

Change-Id: I140365d7fa8026e74e0e1a1b03255320a2ee5520

7 years agoMerge "Revert "Update getentropy_linux.c from upstream.""
Josh Gao [Fri, 2 Sep 2016 08:41:15 +0000 (08:41 +0000)]
Merge "Revert "Update getentropy_linux.c from upstream.""

7 years agoRevert "Update getentropy_linux.c from upstream."
Josh Gao [Fri, 2 Sep 2016 08:39:29 +0000 (08:39 +0000)]
Revert "Update getentropy_linux.c from upstream."

This reverts commit 5faef47e438d20600655e2f5ef473c2d63cbf2c0.

Bug: http://b/31251721
Change-Id: I20a091f385fb77ccc68b8d9fb1d2aee3dec0d0ff

7 years agoMerge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am...
Josh Gao [Fri, 2 Sep 2016 06:06:55 +0000 (06:06 +0000)]
Merge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am: 2f159f0bca am: b51570a58e am: 481cdc2a57
am: 8d84fe223f

Change-Id: I95256e471acfbdb450c4ae5fcdd00a4c0b93657b

7 years agoMerge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am...
Josh Gao [Fri, 2 Sep 2016 06:03:55 +0000 (06:03 +0000)]
Merge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am: 2f159f0bca am: b51570a58e
am: 481cdc2a57

Change-Id: I781a27aff490914a62c22b202ce5ca24e4b159cc

7 years agoMerge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am...
Josh Gao [Fri, 2 Sep 2016 05:59:54 +0000 (05:59 +0000)]
Merge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."" am: 2f159f0bca
am: b51570a58e

Change-Id: I8a50a22c3ee421905aa72907e709275e6c4b107f

7 years agoMerge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used.""
Josh Gao [Fri, 2 Sep 2016 05:56:57 +0000 (05:56 +0000)]
Merge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used.""
am: 2f159f0bca

Change-Id: Iff217394952e64e534a076b36df20e078cb6b344

7 years agoMerge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used.""
Josh Gao [Fri, 2 Sep 2016 05:49:21 +0000 (05:49 +0000)]
Merge "Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used.""

7 years agoRevert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."
Josh Gao [Fri, 2 Sep 2016 05:48:11 +0000 (05:48 +0000)]
Revert "Attempt to use arc4random where getauxval(AT_RANDOM) is used."

This reverts commit 78a52f19bb207d1c736f1d5362e01f338d78645f.

Change-Id: Ia72501ad0b81e894d67e5ce59b597397c11acfa5

7 years agoMerge changes I6932803a,Ia65c038e am: 85b15b1d0b am: dfff1fc6c8 am: 82a1502c09
Josh Gao [Thu, 1 Sep 2016 22:56:08 +0000 (22:56 +0000)]
Merge changes I6932803a,Ia65c038e am: 85b15b1d0b am: dfff1fc6c8 am: 82a1502c09
am: b2c39d65d1

Change-Id: I6e13593edb5381e65fd9c906564bbb649cd3d66c

7 years agoMerge changes I6932803a,Ia65c038e am: 85b15b1d0b am: dfff1fc6c8
Josh Gao [Thu, 1 Sep 2016 22:52:58 +0000 (22:52 +0000)]
Merge changes I6932803a,Ia65c038e am: 85b15b1d0b am: dfff1fc6c8
am: 82a1502c09

Change-Id: I007f506442dbe3d5dad6120fd560103f8c3f1af3

7 years agoMerge changes I6932803a,Ia65c038e am: 85b15b1d0b
Josh Gao [Thu, 1 Sep 2016 22:49:28 +0000 (22:49 +0000)]
Merge changes I6932803a,Ia65c038e am: 85b15b1d0b
am: dfff1fc6c8

Change-Id: I4c12db3905a6ad852410dbe203eecd4ed3e000de

7 years agoMerge changes I6932803a,Ia65c038e
Josh Gao [Thu, 1 Sep 2016 22:46:29 +0000 (22:46 +0000)]
Merge changes I6932803a,Ia65c038e
am: 85b15b1d0b

Change-Id: Iadd490b1bfccea29e3d93d0d741458e31716a118

7 years agoMerge changes I6932803a,Ia65c038e
Josh Gao [Thu, 1 Sep 2016 22:40:12 +0000 (22:40 +0000)]
Merge changes I6932803a,Ia65c038e

* changes:
  Attempt to use arc4random where getauxval(AT_RANDOM) is used.
  Update getentropy_linux.c from upstream.

7 years agoMerge "cc_test_library now creates shared libraries too" am: dd14725eeb am: 4b5216d67...
Dan Willemsen [Thu, 1 Sep 2016 01:49:22 +0000 (01:49 +0000)]
Merge "cc_test_library now creates shared libraries too" am: dd14725eeb am: 4b5216d677 am: 9b6737e86d
am: 299b5e6e68

Change-Id: If133e0e1026d66a08d29d28c358c77bd728bf601

7 years agoMerge "cc_test_library now creates shared libraries too" am: dd14725eeb am: 4b5216d677
Dan Willemsen [Thu, 1 Sep 2016 01:41:12 +0000 (01:41 +0000)]
Merge "cc_test_library now creates shared libraries too" am: dd14725eeb am: 4b5216d677
am: 9b6737e86d

Change-Id: I6584eb2cb237f8155fdeebcce033244d0726e786

7 years agoMerge "cc_test_library now creates shared libraries too" am: dd14725eeb
Dan Willemsen [Thu, 1 Sep 2016 01:38:39 +0000 (01:38 +0000)]
Merge "cc_test_library now creates shared libraries too" am: dd14725eeb
am: 4b5216d677

Change-Id: If4ee300683d0177e636d2cbb744a052289d8d06a

7 years agoMerge "cc_test_library now creates shared libraries too"
Dan Willemsen [Thu, 1 Sep 2016 01:35:39 +0000 (01:35 +0000)]
Merge "cc_test_library now creates shared libraries too"
am: dd14725eeb

Change-Id: I5286c2dcccb8d1741597d9f7fac8e23e38ab1749

7 years agoMerge "cc_test_library now creates shared libraries too"
Treehugger Robot [Thu, 1 Sep 2016 01:27:00 +0000 (01:27 +0000)]
Merge "cc_test_library now creates shared libraries too"

7 years agoAttempt to use arc4random where getauxval(AT_RANDOM) is used.
Josh Gao [Sat, 25 Jun 2016 00:14:14 +0000 (17:14 -0700)]
Attempt to use arc4random where getauxval(AT_RANDOM) is used.

When arc4random can get entropy (which is true for basically everyone
but init on kernels that don't support getrandom), use it instead of
AT_RANDOM.

Bug: http://b/29622562
Change-Id: I6932803af2c477e65562ff531bd959f199fad1df

7 years agoUpdate getentropy_linux.c from upstream.
Josh Gao [Fri, 24 Jun 2016 02:06:35 +0000 (19:06 -0700)]
Update getentropy_linux.c from upstream.

Bug: http://b/29622562
Change-Id: Ia65c038effa6e806c325a8e93c1fe80c50a9f2c9

7 years agoMerge "List failing tests last, to reduce the amount of scrolling." am: af071ed598...
Elliott Hughes [Thu, 1 Sep 2016 00:39:19 +0000 (00:39 +0000)]
Merge "List failing tests last, to reduce the amount of scrolling." am: af071ed598 am: beb7c64177 am: b349ce0025
am: 701a726abd

Change-Id: I1c8440e94ae77ecea400684cea3f1b9ac9edf3ab

7 years agoMerge "List failing tests last, to reduce the amount of scrolling." am: af071ed598...
Elliott Hughes [Wed, 31 Aug 2016 23:37:58 +0000 (23:37 +0000)]
Merge "List failing tests last, to reduce the amount of scrolling." am: af071ed598 am: beb7c64177
am: b349ce0025

Change-Id: Icfaf21eff547f4519e5943860471c7522e969923

7 years agocc_test_library now creates shared libraries too
Dan Willemsen [Wed, 31 Aug 2016 23:35:01 +0000 (16:35 -0700)]
cc_test_library now creates shared libraries too

Make these compile as static libraries by properly declaring their
dependencies.

I turned off the shared version of libBionicTests because it produces
this linker warning (treated as error):

external/libcxx/include/sstream:859: warning: relocation refers to
discarded section

Change-Id: I2e1448b47a441b273d208ebd068d0d22e340a0ff

7 years agoMerge "List failing tests last, to reduce the amount of scrolling." am: af071ed598
Elliott Hughes [Wed, 31 Aug 2016 23:34:58 +0000 (23:34 +0000)]
Merge "List failing tests last, to reduce the amount of scrolling." am: af071ed598
am: beb7c64177

Change-Id: I3467789b8d82c5eafea59aa3dbc8b8838a9cab75

7 years agoMerge "List failing tests last, to reduce the amount of scrolling."
Elliott Hughes [Wed, 31 Aug 2016 23:32:00 +0000 (23:32 +0000)]
Merge "List failing tests last, to reduce the amount of scrolling."
am: af071ed598

Change-Id: I274d1b469b6e92f1e54efd640d737221b6adb434

7 years agoMerge "List failing tests last, to reduce the amount of scrolling."
Treehugger Robot [Wed, 31 Aug 2016 23:13:29 +0000 (23:13 +0000)]
Merge "List failing tests last, to reduce the amount of scrolling."

7 years agoList failing tests last, to reduce the amount of scrolling.
Elliott Hughes [Wed, 31 Aug 2016 20:30:14 +0000 (13:30 -0700)]
List failing tests last, to reduce the amount of scrolling.

On actual devices, we have a lot of slow tests. Warnings about those
cause cause the failed tests to scroll off the display.

Also replace the made-up word "warnline".

Change-Id: I6b579521a21b56da8a1add08cd34888fc902646e

7 years agoMerge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c...
Dimitry Ivanov [Wed, 31 Aug 2016 01:02:27 +0000 (01:02 +0000)]
Merge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c am: a9c9129009 am: 729a12e3ec
am: b276c80443

Change-Id: Id92a59494b2ca2e64e09e163b5b9ac6084e65a2b

7 years agoMerge "Fix SysV IPC test failures on Android devices." am: af730e63a3 am: c5b5e3adc8...
Elliott Hughes [Wed, 31 Aug 2016 01:02:26 +0000 (01:02 +0000)]
Merge "Fix SysV IPC test failures on Android devices." am: af730e63a3 am: c5b5e3adc8 am: 85256c71ab
am: 6bdfbabd01

Change-Id: I85a6cc18cb3c364beb8c74f7ad347bb2bee67518

7 years agoMerge "Update to kernel headers v4.7.2." am: ac04d34573 am: f3cccd17e8 am: 5242a75041
Christopher Ferris [Wed, 31 Aug 2016 00:57:09 +0000 (00:57 +0000)]
Merge "Update to kernel headers v4.7.2." am: ac04d34573 am: f3cccd17e8 am: 5242a75041
am: 86e3d8f9ab

Change-Id: I2561d092de8fad07ff9fc479bfae71ad5fc0d78f

7 years agoMerge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c...
Dimitry Ivanov [Tue, 30 Aug 2016 21:29:12 +0000 (21:29 +0000)]
Merge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c am: a9c9129009
am: 729a12e3ec

Change-Id: I431f776bc02fbad7b3acdd313fdbbac912acdfbb

7 years agoMerge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c
Dimitry Ivanov [Tue, 30 Aug 2016 21:26:12 +0000 (21:26 +0000)]
Merge "Remove $(module)_install_to_out_data flag from test makefile" am: 6d7a1eec4c
am: a9c9129009

Change-Id: I147f45056ec2e4db4c110efcbdc9666862462dd3

7 years agoMerge "Remove $(module)_install_to_out_data flag from test makefile"
Dimitry Ivanov [Tue, 30 Aug 2016 21:23:44 +0000 (21:23 +0000)]
Merge "Remove $(module)_install_to_out_data flag from test makefile"
am: 6d7a1eec4c

Change-Id: Ifbbf4f17810ddafda26e885d3f6be98328257df7

7 years agoMerge "Remove $(module)_install_to_out_data flag from test makefile"
Treehugger Robot [Tue, 30 Aug 2016 21:16:33 +0000 (21:16 +0000)]
Merge "Remove $(module)_install_to_out_data flag from test makefile"

7 years agoMerge "Fix SysV IPC test failures on Android devices." am: af730e63a3 am: c5b5e3adc8
Elliott Hughes [Tue, 30 Aug 2016 19:48:05 +0000 (19:48 +0000)]
Merge "Fix SysV IPC test failures on Android devices." am: af730e63a3 am: c5b5e3adc8
am: 85256c71ab

Change-Id: I1de032b341d0172f17090a8c3099d1f651669156

7 years agoMerge "Fix SysV IPC test failures on Android devices." am: af730e63a3
Elliott Hughes [Tue, 30 Aug 2016 19:44:40 +0000 (19:44 +0000)]
Merge "Fix SysV IPC test failures on Android devices." am: af730e63a3
am: c5b5e3adc8

Change-Id: I09ae5214a24526bbdc388c86f72de4d1eef90ba7

7 years agoMerge "Fix SysV IPC test failures on Android devices."
Elliott Hughes [Tue, 30 Aug 2016 19:42:07 +0000 (19:42 +0000)]
Merge "Fix SysV IPC test failures on Android devices."
am: af730e63a3

Change-Id: I016ef73db87f6493d2452e5525ff69deaecb071f

7 years agoMerge "Fix SysV IPC test failures on Android devices."
Elliott Hughes [Tue, 30 Aug 2016 19:35:04 +0000 (19:35 +0000)]
Merge "Fix SysV IPC test failures on Android devices."

7 years agoRemove $(module)_install_to_out_data flag from test makefile
Dimitry Ivanov [Mon, 29 Aug 2016 20:15:38 +0000 (13:15 -0700)]
Remove $(module)_install_to_out_data flag from test makefile

Use non-empty $(module)_install_to_out_data_dir as indication
of custom target dir for a library.

Bug: http://b/22182538
Test: build and run bionic-unit-tests --gtest_filter=dl*:Dl*
Change-Id: Ibfc87f45084a6fe2f487ca1b17a7625a8d8ec707

7 years agoMerge "Update to kernel headers v4.7.2." am: ac04d34573 am: f3cccd17e8
Christopher Ferris [Mon, 29 Aug 2016 19:28:08 +0000 (19:28 +0000)]
Merge "Update to kernel headers v4.7.2." am: ac04d34573 am: f3cccd17e8
am: 5242a75041

Change-Id: I5970bbf4294fcc492faec86a9c3856a3bc30c7a2

7 years agoMerge "Update to kernel headers v4.7.2." am: ac04d34573
Christopher Ferris [Mon, 29 Aug 2016 19:21:43 +0000 (19:21 +0000)]
Merge "Update to kernel headers v4.7.2." am: ac04d34573
am: f3cccd17e8

Change-Id: I875eed2965dd166c302d1560fe9944ba5eda5ae3

7 years agoMerge "Update to kernel headers v4.7.2."
Christopher Ferris [Mon, 29 Aug 2016 19:18:19 +0000 (19:18 +0000)]
Merge "Update to kernel headers v4.7.2."
am: ac04d34573

Change-Id: I1fb4372501a2b0ca8e4ccee2ea116949038dd9bb

7 years agoMerge "Update to kernel headers v4.7.2."
Christopher Ferris [Mon, 29 Aug 2016 19:14:09 +0000 (19:14 +0000)]
Merge "Update to kernel headers v4.7.2."

7 years agoUpdate to kernel headers v4.7.2.
Christopher Ferris [Wed, 24 Aug 2016 19:15:38 +0000 (12:15 -0700)]
Update to kernel headers v4.7.2.

Modify the kernel header update script to rename C++ keyword
struct members to something else. This fixes problems when including
these kernel files in C++ code.

Also, make a manual change to linux/fib_rules.h and comment out the
value FRA_PAD since it conflicts with a special android kernel value
FRA_UID_START that has not been upstreamed yet.

Test: Built aosp_angler, aosp_x86_64, aosp_mips (bionic only)
Test: Booted on angler and ran bionic unit tests
Test: Built these changes in internal master

Change-Id: Ia22b7e3ca409404696dba76311f49157f4a9ceed

7 years agoMerge "Fix pty.bug_28979140 test in Bionic" am: b04c771581 am: 9ca139dbdd am: 391ae146c5
Alex Vakulenko [Sat, 27 Aug 2016 19:31:56 +0000 (19:31 +0000)]
Merge "Fix pty.bug_28979140 test in Bionic" am: b04c771581 am: 9ca139dbdd am: 391ae146c5
am: 1233ebf652

Change-Id: I6eb9ebda84006e1afdfc5a071946af8c777ef172

7 years agoMerge "Fix pty.bug_28979140 test in Bionic" am: b04c771581 am: 9ca139dbdd
Alex Vakulenko [Sat, 27 Aug 2016 19:10:13 +0000 (19:10 +0000)]
Merge "Fix pty.bug_28979140 test in Bionic" am: b04c771581 am: 9ca139dbdd
am: 391ae146c5

Change-Id: I294497f479bfaaa5f64f8c228c80014ab4c6449a

7 years agoMerge "Fix pty.bug_28979140 test in Bionic" am: b04c771581
Alex Vakulenko [Sat, 27 Aug 2016 19:06:43 +0000 (19:06 +0000)]
Merge "Fix pty.bug_28979140 test in Bionic" am: b04c771581
am: 9ca139dbdd

Change-Id: I86dc1f5d90c1f5938caef90459cd19e72a913868

7 years agoMerge "Fix pty.bug_28979140 test in Bionic"
Alex Vakulenko [Sat, 27 Aug 2016 19:03:47 +0000 (19:03 +0000)]
Merge "Fix pty.bug_28979140 test in Bionic"
am: b04c771581

Change-Id: I9229189d6f4661375fd293119c2421a34ecda66c

7 years agoMerge "Fix pty.bug_28979140 test in Bionic"
Treehugger Robot [Sat, 27 Aug 2016 18:57:47 +0000 (18:57 +0000)]
Merge "Fix pty.bug_28979140 test in Bionic"

7 years agoFix pty.bug_28979140 test in Bionic
Alex Vakulenko [Tue, 12 Jul 2016 00:26:35 +0000 (17:26 -0700)]
Fix pty.bug_28979140 test in Bionic

The test relies on the fact/assumes that CPU 0 is available to the
test process. This is not necessarily the case. Instead of allocating
CPU 0 to the main thread, find the first available CPU and use that
instead.

BUG=b/29991929
TEST=All Bionic unit tests pass

(cherrypick of 766275e7f697c30164678e1fed55b2a2fcbf8546.)

Change-Id: I36b311cdba57112d663d652757fd5114183fc780

7 years agoFix SysV IPC test failures on Android devices.
Elliott Hughes [Sat, 27 Aug 2016 01:33:19 +0000 (18:33 -0700)]
Fix SysV IPC test failures on Android devices.

SysV IPC has been compiled out of all our kernels.

Change-Id: I1294459697ed7dff4f21af5c7b04c8b3d3649329

7 years agoMerge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f am...
Dimitry Ivanov [Sat, 27 Aug 2016 02:01:39 +0000 (02:01 +0000)]
Merge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f am: 2bbb8e430d am: 0085edef05
am: 93bbf343a6

Change-Id: Ic66f8b54b884ad1183fe329e773b88abc2eccaee

7 years agoMerge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f am...
Dimitry Ivanov [Sat, 27 Aug 2016 01:38:12 +0000 (01:38 +0000)]
Merge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f am: 2bbb8e430d
am: 0085edef05

Change-Id: I8b033eb8d702c1e49556e7cfdfdb0ea35054a427

7 years agoMerge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f
Dimitry Ivanov [Sat, 27 Aug 2016 01:35:42 +0000 (01:35 +0000)]
Merge "Initialize __abort_message_ptr in linker's copy of libc" am: 3db601360f
am: 2bbb8e430d

Change-Id: I1dc55f1a80efc13f7962ec7bb3fce1d4a0a42d2d

7 years agoMerge "Initialize __abort_message_ptr in linker's copy of libc"
Dimitry Ivanov [Sat, 27 Aug 2016 01:32:44 +0000 (01:32 +0000)]
Merge "Initialize __abort_message_ptr in linker's copy of libc"
am: 3db601360f

Change-Id: Iee4f12c0d3a662018e3842ab519b8ec195d1a5c8

7 years agoMerge "Initialize __abort_message_ptr in linker's copy of libc"
Treehugger Robot [Sat, 27 Aug 2016 01:22:09 +0000 (01:22 +0000)]
Merge "Initialize __abort_message_ptr in linker's copy of libc"

7 years agoInitialize __abort_message_ptr in linker's copy of libc
Dimitry Ivanov [Fri, 26 Aug 2016 22:45:05 +0000 (15:45 -0700)]
Initialize __abort_message_ptr in linker's copy of libc

The linker calls to __libc_fatal resulted in tombstones
with missing abort message. This commit fixes it by
initializing __abort_message_ptr for the linker's copy
of libc.

Bug: http://b/31095185
Change-Id: I883d654d7fd0ef309c80f8021202b6bfd5d5cea5

7 years agoMerge "Fix dlext.ns_smoke test" into nyc-mr1-dev am: abe80314eb am: 3cd6dbec6b
Dimitry Ivanov [Fri, 26 Aug 2016 23:27:39 +0000 (23:27 +0000)]
Merge "Fix dlext.ns_smoke test" into nyc-mr1-dev am: abe80314eb am: 3cd6dbec6b
am: d7f0329f52

Change-Id: I79484a5f3599c09b667670bf69c5d28ecd802342

7 years agoresolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
Dimitry Ivanov [Fri, 26 Aug 2016 23:27:38 +0000 (23:27 +0000)]
resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
am: e1703b4582

Change-Id: I96bbd5a036b0d77658294792c730e4e8c3c0ecdd

7 years agoMerge "Fix dlext.ns_smoke test" into nyc-mr1-dev am: abe80314eb
Dimitry Ivanov [Fri, 26 Aug 2016 22:43:04 +0000 (22:43 +0000)]
Merge "Fix dlext.ns_smoke test" into nyc-mr1-dev am: abe80314eb
am: 3cd6dbec6b

Change-Id: Ifde5c7c9350bbacebd5a6141733dc6fd818eab26

7 years agoresolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
Dimitry Ivanov [Fri, 26 Aug 2016 22:38:26 +0000 (15:38 -0700)]
resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp

Change-Id: Ibe680bbc473fc5ce1ced2d50e1b8e20149a59a08

7 years agoMerge "Fix dlext.ns_smoke test" into nyc-mr1-dev
Dimitry Ivanov [Fri, 26 Aug 2016 22:04:28 +0000 (22:04 +0000)]
Merge "Fix dlext.ns_smoke test" into nyc-mr1-dev
am: abe80314eb

Change-Id: I1bda620e360b96757c13394f290e45e1a981b9aa

7 years agoFix dlext.ns_smoke test
Dimitry Ivanov [Fri, 26 Aug 2016 22:04:28 +0000 (22:04 +0000)]
Fix dlext.ns_smoke test
am: 23af6af7c2

Change-Id: I2f2106a03e573abf4f3d2574040c6cb4203fff1d

7 years agoMerge "Fix dlext.ns_smoke test" into nyc-mr1-dev
Dimitry Ivanov [Fri, 26 Aug 2016 21:57:40 +0000 (21:57 +0000)]
Merge "Fix dlext.ns_smoke test" into nyc-mr1-dev

7 years agoMerge "Fix a typo in the debug malloc usage info" am: 0b1a282650 am: def8d66632 am...
Christopher Ferris [Fri, 26 Aug 2016 19:46:45 +0000 (19:46 +0000)]
Merge "Fix a typo in the debug malloc usage info" am: 0b1a282650 am: def8d66632 am: 4da267660b
am: 53aae1a0d5

Change-Id: I2720ad73a52722daf14ba3d7c97caad10e8d66a4

7 years agoMerge "Revert "Switch back to the BSD exec for now."" am: 6313116b74 am: d11f678c52...
Elliott Hughes [Fri, 26 Aug 2016 19:46:44 +0000 (19:46 +0000)]
Merge "Revert "Switch back to the BSD exec for now."" am: 6313116b74 am: d11f678c52 am: df2a9f22cb
am: 458389e4b2

Change-Id: If24a65217e1ed47b1ce9676a332f6b63ffc76730

7 years agoMerge "Fix a typo in the debug malloc usage info" am: 0b1a282650 am: def8d66632
Christopher Ferris [Fri, 26 Aug 2016 18:12:44 +0000 (18:12 +0000)]
Merge "Fix a typo in the debug malloc usage info" am: 0b1a282650 am: def8d66632
am: 4da267660b

Change-Id: I328df1b6d87aebe3ba0d1a825061483764370bbd

7 years agoMerge "Revert "Switch back to the BSD exec for now."" am: 6313116b74 am: d11f678c52
Elliott Hughes [Fri, 26 Aug 2016 18:12:43 +0000 (18:12 +0000)]
Merge "Revert "Switch back to the BSD exec for now."" am: 6313116b74 am: d11f678c52
am: df2a9f22cb

Change-Id: Ib602c06104db7feb8e98664fcd62cd9e55628f79

7 years agoMerge "Fix a typo in the debug malloc usage info" am: 0b1a282650
Christopher Ferris [Fri, 26 Aug 2016 18:09:42 +0000 (18:09 +0000)]
Merge "Fix a typo in the debug malloc usage info" am: 0b1a282650
am: def8d66632

Change-Id: Iefa1cfa34d8e3dc61ff1919ec7dfdc857cf1bd4c

7 years agoMerge "Revert "Switch back to the BSD exec for now."" am: 6313116b74
Elliott Hughes [Fri, 26 Aug 2016 18:09:41 +0000 (18:09 +0000)]
Merge "Revert "Switch back to the BSD exec for now."" am: 6313116b74
am: d11f678c52

Change-Id: Ic89b0b663ed82325e0ef5fb79ba078b33a00670f

7 years agoMerge "Fix a typo in the debug malloc usage info"
Christopher Ferris [Fri, 26 Aug 2016 18:07:15 +0000 (18:07 +0000)]
Merge "Fix a typo in the debug malloc usage info"
am: 0b1a282650

Change-Id: Ia4cc47f98ae25343292d13d06a5cce0b0ad390c9

7 years agoMerge "Revert "Switch back to the BSD exec for now.""
Elliott Hughes [Fri, 26 Aug 2016 18:07:14 +0000 (18:07 +0000)]
Merge "Revert "Switch back to the BSD exec for now.""
am: 6313116b74

Change-Id: Ib29d904548e0a3cd56363b867ab2e5705518828e

7 years agoMerge "Fix a typo in the debug malloc usage info"
Christopher Ferris [Fri, 26 Aug 2016 17:58:09 +0000 (17:58 +0000)]
Merge "Fix a typo in the debug malloc usage info"

7 years agoMerge "Revert "Switch back to the BSD exec for now.""
Treehugger Robot [Fri, 26 Aug 2016 17:54:48 +0000 (17:54 +0000)]
Merge "Revert "Switch back to the BSD exec for now.""

7 years agoMerge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a...
Elliott Hughes [Fri, 26 Aug 2016 17:16:57 +0000 (17:16 +0000)]
Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a am: bb4f16227e am: 389869899a
am: 1cfad1622d

Change-Id: Icbe0bb316d6feb5b9685e53a99cce4af353d6c54

7 years agoMerge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a...
Elliott Hughes [Fri, 26 Aug 2016 16:28:06 +0000 (16:28 +0000)]
Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a am: bb4f16227e
am: 389869899a

Change-Id: I5811305ab1495f4c3917e42bef31dcfceff11bfa

7 years agoMerge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a
Elliott Hughes [Fri, 26 Aug 2016 16:24:34 +0000 (16:24 +0000)]
Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC." am: 6395a3047a
am: bb4f16227e

Change-Id: I8e14e0eeef738fa55a0238c8670ffe5c23b4c020

7 years agoMerge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC."
Elliott Hughes [Fri, 26 Aug 2016 16:22:06 +0000 (16:22 +0000)]
Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC."
am: 6395a3047a

Change-Id: Iafdeef9a7f33a4697e3193bb62fea6e2b3977d7a

7 years agoRevert "Switch back to the BSD exec for now."
Elliott Hughes [Fri, 26 Aug 2016 16:15:57 +0000 (16:15 +0000)]
Revert "Switch back to the BSD exec for now."

This reverts commit 18c31d7f4c93309a0f316412fcc6a829e41eaaae.

63615066d9f0b0b1c653c91a9b305e6c292c835a fixed the bug.

Change-Id: I1d59c4be6ad1a05b23dce0198737f0789d7e034a

7 years agoMerge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC."
Elliott Hughes [Fri, 26 Aug 2016 16:14:52 +0000 (16:14 +0000)]
Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC."

7 years agoFix a typo in the debug malloc usage info
Tamas Berghammer [Fri, 26 Aug 2016 11:34:16 +0000 (12:34 +0100)]
Fix a typo in the debug malloc usage info

Change-Id: I010fdc6c228a5f64edfef1c267cde7a2eef5190b

8 years agolinker: stat /proc/self/exe instead of executable_path am: f987129903 am: d5ac5ffa43...
Dimitry Ivanov [Fri, 26 Aug 2016 05:58:00 +0000 (05:58 +0000)]
linker: stat /proc/self/exe instead of executable_path am: f987129903 am: d5ac5ffa43 am: 2f268b7d50
am: 450d3eca7a

Change-Id: I75c96462f89f5707b0a14e7bf9e6bf45f8eaa17d

8 years agolinker: stat /proc/self/exe instead of executable_path am: f987129903 am: d5ac5ffa43
Dimitry Ivanov [Fri, 26 Aug 2016 05:24:54 +0000 (05:24 +0000)]
linker: stat /proc/self/exe instead of executable_path am: f987129903 am: d5ac5ffa43
am: 2f268b7d50

Change-Id: I0764472f29b358e3ba35d877acf6b336e5429dfe

8 years agolinker: stat /proc/self/exe instead of executable_path am: f987129903
Dimitry Ivanov [Fri, 26 Aug 2016 05:22:24 +0000 (05:22 +0000)]
linker: stat /proc/self/exe instead of executable_path am: f987129903
am: d5ac5ffa43

Change-Id: Iaae5632101b4af9a48fee6c897edb5b8ec6979e3

8 years agolinker: stat /proc/self/exe instead of executable_path
Dimitry Ivanov [Fri, 26 Aug 2016 05:19:54 +0000 (05:19 +0000)]
linker: stat /proc/self/exe instead of executable_path
am: f987129903

Change-Id: I9d523394eea21f14abf4ad02c424afe028f38b4f

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278 am...
Dimitry Ivanov [Fri, 26 Aug 2016 05:18:02 +0000 (05:18 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278 am: 1932e631ec am: c9ee4f0589
am: 130f93cb67

Change-Id: I321b8f8e553a8d5a110e4e452381813f5b44eeb7

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278 am...
Dimitry Ivanov [Fri, 26 Aug 2016 04:43:51 +0000 (04:43 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278 am: 1932e631ec
am: c9ee4f0589

Change-Id: I0d5412fcf6a3a22e80ac38972304e953052415a3

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278
Dimitry Ivanov [Fri, 26 Aug 2016 04:40:51 +0000 (04:40 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" am: a1e5972278
am: 1932e631ec

Change-Id: I21a75fdcc255ba24afc9bf500f45cdf45b1fc1ed

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path"
Dimitry Ivanov [Fri, 26 Aug 2016 04:38:24 +0000 (04:38 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path"
am: a1e5972278

Change-Id: Id37f371faedd2b84fce5d2d196baf443e7ab6b1b

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path"
Treehugger Robot [Fri, 26 Aug 2016 04:32:53 +0000 (04:32 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path"

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev am...
Dimitry Ivanov [Fri, 26 Aug 2016 02:57:14 +0000 (02:57 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev am: 690c8ba6e7 am: d358736eac
am: 14d0d33112

Change-Id: I548af61215184559430c4423594515271acf07dd

8 years agolinker: stat /proc/self/exe instead of executable_path am: 7da4bbbe87 am: 8143c4eaa5
Dimitry Ivanov [Fri, 26 Aug 2016 02:57:13 +0000 (02:57 +0000)]
linker: stat /proc/self/exe instead of executable_path am: 7da4bbbe87 am: 8143c4eaa5
am: 72a97f8d35

Change-Id: Ia98441ea82e8881402b3f3616af780c5f4129ff2

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev am...
Dimitry Ivanov [Fri, 26 Aug 2016 02:46:45 +0000 (02:46 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev am: 690c8ba6e7
am: d358736eac

Change-Id: Ib97082ddae0f6dd9f76e4fab91a878ab3b39ae86

8 years agolinker: stat /proc/self/exe instead of executable_path am: 7da4bbbe87
Dimitry Ivanov [Fri, 26 Aug 2016 02:46:44 +0000 (02:46 +0000)]
linker: stat /proc/self/exe instead of executable_path am: 7da4bbbe87
am: 8143c4eaa5

Change-Id: I576b5b952290a217be60d6d625b8ae16c63eb1b3

8 years agoMerge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev
Dimitry Ivanov [Fri, 26 Aug 2016 02:44:14 +0000 (02:44 +0000)]
Merge "linker: stat /proc/self/exe instead of executable_path" into nyc-mr1-dev
am: 690c8ba6e7

Change-Id: Ib66401072a32c6bc5ebb7a435ace19e9f22a2916

8 years agolinker: stat /proc/self/exe instead of executable_path
Dimitry Ivanov [Fri, 26 Aug 2016 02:44:13 +0000 (02:44 +0000)]
linker: stat /proc/self/exe instead of executable_path
am: 7da4bbbe87

Change-Id: I4dc2883489876ac44c8a5b302511f49a2ad4e77d