OSDN Git Service

android-x86/bionic.git
7 years agoMerge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into...
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

7 years agoMerge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into...
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

7 years agoMerge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a am: e716af709d...
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

7 years agoMerge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a am: e716af709d
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

7 years agoMerge "Update <arpa/*> from FreeBSD." am: 0ff813fb48 am: 05ebd700a5
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

7 years agoMerge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 22:38:05 +0000 (22:38 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp-master am: 9bd321eaa3" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into...
Android Build Merger (Role) [Thu, 6 Jul 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp-master am: 9bd321eaa3" into oc-dev-plus-aosp

7 years agoMerge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp...
Elliott Hughes [Thu, 6 Jul 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp-master
am: 9bd321eaa3

Change-Id: I89da7873488b72f5950816e49dedfbbbc48da612

7 years agoMerge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a am: e716af709d...
Android Build Merger (Role) [Thu, 6 Jul 2017 22:37:47 +0000 (22:37 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a am: e716af709d" into oc-dev-plus-aosp

7 years agoMerge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp...
Elliott Hughes [Thu, 6 Jul 2017 22:37:46 +0000 (22:37 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp-master
am: 9bd321eaa3

Change-Id: I5f7e01bad0eb7e59c43cae5276803c277711c648

7 years agoMerge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a
Elliott Hughes [Thu, 6 Jul 2017 22:37:41 +0000 (22:37 +0000)]
Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a
am: e716af709d

Change-Id: If96e2b77e8206f0467375dfa8cfc1f413e4e905a

7 years agoMerge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a
Elliott Hughes [Thu, 6 Jul 2017 22:37:32 +0000 (22:37 +0000)]
Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a
am: e716af709d

Change-Id: I311b886b87c1a47c03d7ccd4132a77039dd96b7e

7 years agoMerge "Update <arpa/*> from FreeBSD." am: 0ff813fb48
Elliott Hughes [Thu, 6 Jul 2017 22:37:22 +0000 (22:37 +0000)]
Merge "Update <arpa/*> from FreeBSD." am: 0ff813fb48
am: 05ebd700a5

Change-Id: Ie841e27054c8c1c337231207fcf86909e983307e

7 years agoMerge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp...
Android Build Merger (Role) [Thu, 6 Jul 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Merge "Make <sys/ttydefaults.h> more usable." am: 1de6d0bb8a" into stage-aosp-master

7 years agoMerge "Make <sys/ttydefaults.h> more usable."
Elliott Hughes [Thu, 6 Jul 2017 22:33:54 +0000 (22:33 +0000)]
Merge "Make <sys/ttydefaults.h> more usable."
am: 1de6d0bb8a

Change-Id: Ib24f784a4b5c7f69af4a0bfd17410178a54291bb

7 years agoMerge "Make <sys/ttydefaults.h> more usable."
Elliott Hughes [Thu, 6 Jul 2017 22:33:46 +0000 (22:33 +0000)]
Merge "Make <sys/ttydefaults.h> more usable."
am: 1de6d0bb8a

Change-Id: Id12e3e0847f8c114509f9acd4ef3751c889cae18

7 years agoMerge "Update <arpa/*> from FreeBSD."
Elliott Hughes [Thu, 6 Jul 2017 22:33:33 +0000 (22:33 +0000)]
Merge "Update <arpa/*> from FreeBSD."
am: 0ff813fb48

Change-Id: I37f5c75e5357d3292b1ab0e6f037771ebe036ba9

7 years agoMerge "Make <sys/ttydefaults.h> more usable."
Elliott Hughes [Thu, 6 Jul 2017 22:20:34 +0000 (22:20 +0000)]
Merge "Make <sys/ttydefaults.h> more usable."

7 years agoMerge "Update <arpa/*> from FreeBSD."
Elliott Hughes [Thu, 6 Jul 2017 22:15:04 +0000 (22:15 +0000)]
Merge "Update <arpa/*> from FreeBSD."

7 years agoMerge "Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55a...
Android Build Merger (Role) [Thu, 6 Jul 2017 21:41:54 +0000 (21:41 +0000)]
Merge "Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad am: b73a1b14bf" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55a...
Android Build Merger (Role) [Thu, 6 Jul 2017 21:41:48 +0000 (21:41 +0000)]
Merge "Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad am: b73a1b14bf" into oc-dr1-dev-plus-aosp

7 years agoMerge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad
Elliott Hughes [Thu, 6 Jul 2017 21:41:46 +0000 (21:41 +0000)]
Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad
am: b73a1b14bf

Change-Id: I3c8d467877f70b39b57b49ba4aa9492d119a410e

7 years agoMerge "Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am...
Android Build Merger (Role) [Thu, 6 Jul 2017 21:41:41 +0000 (21:41 +0000)]
Merge "Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08 am: 065237718a am: ad206bcbee" into oc-dr1-dev-plus-aosp

7 years agoMerge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad
Elliott Hughes [Thu, 6 Jul 2017 21:41:39 +0000 (21:41 +0000)]
Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7 am: fcd2e55aad
am: b73a1b14bf

Change-Id: I4a4d3803c7397a9dee33128b4c855481273de167

7 years agoMerge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe...
Elliott Hughes [Thu, 6 Jul 2017 21:41:33 +0000 (21:41 +0000)]
Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08 am: 065237718a
am: ad206bcbee

Change-Id: I36fb7c9788ed249f480f5782eef04c17aae2fd22

7 years agoMerge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe...
Elliott Hughes [Thu, 6 Jul 2017 21:41:28 +0000 (21:41 +0000)]
Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08 am: 065237718a
am: ad206bcbee

Change-Id: I5d1bce9da0987dca21b63a88b6ef43cda395d174

7 years agoMerge "Fix <dirent.h> d_ino/d_off types." am: 913ae73395 am: e348783c25
Elliott Hughes [Thu, 6 Jul 2017 21:41:15 +0000 (21:41 +0000)]
Merge "Fix <dirent.h> d_ino/d_off types." am: 913ae73395 am: e348783c25
am: 55c8cdc4ec

Change-Id: Ica3add7622f513f98c1b8e00db8aac26fe09f702

7 years agoMerge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7
Elliott Hughes [Thu, 6 Jul 2017 21:31:09 +0000 (21:31 +0000)]
Merge "Claim to have a POSIX shell and utilities." am: 4ceefe27e7
am: fcd2e55aad

Change-Id: Iedff0620953d3f398d1aebda96a097c4a4537533

7 years agoMerge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08
Elliott Hughes [Thu, 6 Jul 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08
am: 065237718a

Change-Id: If315bb28d5f2b877df7339011f0cae3e7e361d63

7 years agoMerge "Fix <dirent.h> d_ino/d_off types." am: 913ae73395
Elliott Hughes [Thu, 6 Jul 2017 21:30:40 +0000 (21:30 +0000)]
Merge "Fix <dirent.h> d_ino/d_off types." am: 913ae73395
am: e348783c25

Change-Id: Ia8afdee5e733e402e99d6486888428b3d6f30ff9

7 years agoMerge "Claim to have a POSIX shell and utilities."
Elliott Hughes [Thu, 6 Jul 2017 21:28:40 +0000 (21:28 +0000)]
Merge "Claim to have a POSIX shell and utilities."
am: 4ceefe27e7

Change-Id: If83c6aae722d91e8b3f5a8e50913e9d9e6dd824e

7 years agoMerge "Conditionally expose splice(2) and sync_file_range(2) constants."
Elliott Hughes [Thu, 6 Jul 2017 21:28:24 +0000 (21:28 +0000)]
Merge "Conditionally expose splice(2) and sync_file_range(2) constants."
am: 10c836fe08

Change-Id: Ib8e57dc7d8332d36b606eac506e69d5926e517b8

7 years agoMerge "Fix <dirent.h> d_ino/d_off types."
Elliott Hughes [Thu, 6 Jul 2017 21:28:10 +0000 (21:28 +0000)]
Merge "Fix <dirent.h> d_ino/d_off types."
am: 913ae73395

Change-Id: Iea1f3121dbd310e9b0c51a96005c43723938c90b

7 years agoMerge "Claim to have a POSIX shell and utilities."
Elliott Hughes [Thu, 6 Jul 2017 21:22:20 +0000 (21:22 +0000)]
Merge "Claim to have a POSIX shell and utilities."

7 years agoMerge "Conditionally expose splice(2) and sync_file_range(2) constants."
Elliott Hughes [Thu, 6 Jul 2017 21:21:20 +0000 (21:21 +0000)]
Merge "Conditionally expose splice(2) and sync_file_range(2) constants."

7 years agoMerge "Fix <dirent.h> d_ino/d_off types."
Elliott Hughes [Thu, 6 Jul 2017 21:15:35 +0000 (21:15 +0000)]
Merge "Fix <dirent.h> d_ino/d_off types."

7 years agoMake <sys/ttydefaults.h> more usable.
Elliott Hughes [Thu, 6 Jul 2017 17:33:15 +0000 (10:33 -0700)]
Make <sys/ttydefaults.h> more usable.

* TTYDEF_OFLAG referred to the BSD OXTABS constant instead of the Linux XTABS,
  so references to it wouldn't compile.

* CEOL was incorrect (compared to `stty -a`).

* ttydefchars wouldn't compile (removed rather than attempt to fix something
  of unclear utility).

Bug: http://b/63145226
Test: new test
Change-Id: I823e5eaab789cafd2eeea03f77ea553346822f74

7 years agoMerge "The ifdef check for AT_SYSINFO_EHDR is no longer needed" am: 9d2d21d636 am...
Dimitry Ivanov [Thu, 6 Jul 2017 15:25:06 +0000 (15:25 +0000)]
Merge "The ifdef check for AT_SYSINFO_EHDR is no longer needed" am: 9d2d21d636 am: 66479d88d1
am: df800eba5e

Change-Id: I46ecfdbfef7c20ba09dfae2169398be116744d61

7 years agoMerge "The ifdef check for AT_SYSINFO_EHDR is no longer needed" am: 9d2d21d636
Dimitry Ivanov [Thu, 6 Jul 2017 15:22:35 +0000 (15:22 +0000)]
Merge "The ifdef check for AT_SYSINFO_EHDR is no longer needed" am: 9d2d21d636
am: 66479d88d1

Change-Id: I00e96306854b9ccff8cae5b13b7ef303552f7a67

7 years agoMerge "The ifdef check for AT_SYSINFO_EHDR is no longer needed"
Dimitry Ivanov [Thu, 6 Jul 2017 15:20:05 +0000 (15:20 +0000)]
Merge "The ifdef check for AT_SYSINFO_EHDR is no longer needed"
am: 9d2d21d636

Change-Id: I00cfa9f85bafb069f3ce029baea71b496e4c9b6e

7 years agoMerge "The ifdef check for AT_SYSINFO_EHDR is no longer needed"
Dimitry Ivanov [Thu, 6 Jul 2017 15:16:03 +0000 (15:16 +0000)]
Merge "The ifdef check for AT_SYSINFO_EHDR is no longer needed"

7 years agoMerge "Bionic: Add ziparchive test dependency" am: 7b7475ce85 am: 6b3a608fc9
Andreas Gampe [Thu, 6 Jul 2017 15:05:36 +0000 (15:05 +0000)]
Merge "Bionic: Add ziparchive test dependency" am: 7b7475ce85 am: 6b3a608fc9
am: 1ee4abfdd5

Change-Id: I86a9ba11444d17735be6e99f8de9eb39c7358b21

7 years agoMerge "Bionic: Add ziparchive test dependency" am: 7b7475ce85
Andreas Gampe [Thu, 6 Jul 2017 15:02:34 +0000 (15:02 +0000)]
Merge "Bionic: Add ziparchive test dependency" am: 7b7475ce85
am: 6b3a608fc9

Change-Id: I93b68b7cf481852857b8b25163b48e6de64cdfeb

7 years agoMerge "Bionic: Add ziparchive test dependency"
Andreas Gampe [Thu, 6 Jul 2017 15:00:04 +0000 (15:00 +0000)]
Merge "Bionic: Add ziparchive test dependency"
am: 7b7475ce85

Change-Id: I391591c530b2c33ddb8ace15c98f895e52140c5f

7 years agoMerge "Bionic: Add ziparchive test dependency"
Treehugger Robot [Thu, 6 Jul 2017 14:48:01 +0000 (14:48 +0000)]
Merge "Bionic: Add ziparchive test dependency"

7 years agoThe ifdef check for AT_SYSINFO_EHDR is no longer needed
dimitry [Thu, 6 Jul 2017 10:17:14 +0000 (12:17 +0200)]
The ifdef check for AT_SYSINFO_EHDR is no longer needed

AT_SYSINFO_EHDR is present in all architectures

Test: make
Change-Id: I0f4c115bb48e47ea156e7fca936960f5f10c618e

7 years agoBionic: Add ziparchive test dependency
Andreas Gampe [Thu, 6 Jul 2017 05:36:20 +0000 (22:36 -0700)]
Bionic: Add ziparchive test dependency

Add missing dependency.

Bug: 37342627
Test: m
test: mmma bionic
Change-Id: I43ae69a007f0e8745db5721296f457b3e58206dd

7 years agoClaim to have a POSIX shell and utilities.
Elliott Hughes [Wed, 5 Jul 2017 23:45:55 +0000 (16:45 -0700)]
Claim to have a POSIX shell and utilities.

We pretty much do these days. And apparently some GNU tools turn on obsolete
backwards-compatible behaviors otherwise.

Bug: http://b/63145226
Test: builds
Change-Id: I9a8af860768cc2c10548f172d1e8b4fba3e5115b

7 years agoUpdate <arpa/*> from FreeBSD.
Elliott Hughes [Wed, 5 Jul 2017 22:51:44 +0000 (15:51 -0700)]
Update <arpa/*> from FreeBSD.

We've had <arpa/telnet.h> for years, despite being slightly more useless
than <arpa/ftp.h> and <arpa/tftp.h>. The inetutils package expects these
to be available.

Bug: http://b/63145226
Test: builds
Change-Id: I1e3c7421779e965b3342d681fefb8dc2561b604d

7 years agoConditionally expose splice(2) and sync_file_range(2) constants.
Elliott Hughes [Wed, 5 Jul 2017 22:59:58 +0000 (15:59 -0700)]
Conditionally expose splice(2) and sync_file_range(2) constants.

As in other places, only expose the constants at API levels where
we're also exposing the functions (to cope with "poor man's configure"
where an author assumes the presence of the #define to imply the
availability of the function).

Bug: http://b/63145226
Test: builds
Change-Id: I524f7288513aa6c35479c550e748a619397929b0

7 years agoFix <dirent.h> d_ino/d_off types.
Elliott Hughes [Wed, 5 Jul 2017 19:34:29 +0000 (12:34 -0700)]
Fix <dirent.h> d_ino/d_off types.

Bug: http://b/63336806
Test: builds
Change-Id: I781e7c66c41bcb772d49ce7c23aab185ddd5da1e

7 years agoMerge "Work around missing _Exit in old API levels." am: f45bc14d54 am: 9995dc1519
Elliott Hughes [Sat, 1 Jul 2017 16:09:33 +0000 (16:09 +0000)]
Merge "Work around missing _Exit in old API levels." am: f45bc14d54 am: 9995dc1519
am: 49d03863dc

Change-Id: I73c54d4f0fc5aced0d2947f0c1b7ee573a832e04

7 years agoMerge "Work around missing _Exit in old API levels." am: f45bc14d54
Elliott Hughes [Sat, 1 Jul 2017 16:05:01 +0000 (16:05 +0000)]
Merge "Work around missing _Exit in old API levels." am: f45bc14d54
am: 9995dc1519

Change-Id: I348562e917298bf93623f1bdb969a14d823a637c

7 years agoMerge "Work around missing _Exit in old API levels."
Elliott Hughes [Sat, 1 Jul 2017 15:59:32 +0000 (15:59 +0000)]
Merge "Work around missing _Exit in old API levels."
am: f45bc14d54

Change-Id: I29dcf7229132c304bc55486444decb16813fbe86

7 years agoMerge "Work around missing _Exit in old API levels."
Elliott Hughes [Sat, 1 Jul 2017 15:48:58 +0000 (15:48 +0000)]
Merge "Work around missing _Exit in old API levels."

7 years agoWork around missing _Exit in old API levels.
Elliott Hughes [Fri, 30 Jun 2017 23:39:25 +0000 (16:39 -0700)]
Work around missing _Exit in old API levels.

Rather than do this in libandroid_support, we may as well just stick it with
the other historical stdlib workarounds in bionic itself...

Bug: N/A
Test: built new NDK test
Change-Id: Ia5cf4010581eb79d4adf924e87d0bc050b9e2839

7 years agoMerge "Add version info for C++ versions of basename, strchrnul." am: d09f3b67a3...
Josh Gao [Fri, 30 Jun 2017 22:49:04 +0000 (22:49 +0000)]
Merge "Add version info for C++ versions of basename, strchrnul." am: d09f3b67a3 am: 5a58a619a9
am: 0f3221b2ab

Change-Id: I7e122b7e7004e35746388921cbcf146c06e4b4b5

7 years agoMerge "Add version info for C++ versions of basename, strchrnul." am: d09f3b67a3
Josh Gao [Fri, 30 Jun 2017 22:45:04 +0000 (22:45 +0000)]
Merge "Add version info for C++ versions of basename, strchrnul." am: d09f3b67a3
am: 5a58a619a9

Change-Id: Ibcf425385db5f3889a3c6f048cfea9514c417fb5

7 years agoMerge "Add version info for C++ versions of basename, strchrnul."
Josh Gao [Fri, 30 Jun 2017 22:40:04 +0000 (22:40 +0000)]
Merge "Add version info for C++ versions of basename, strchrnul."
am: d09f3b67a3

Change-Id: I5742b5917acb4386940b15ce77ee8d4e910671e3

7 years agoMerge "Add version info for C++ versions of basename, strchrnul."
Treehugger Robot [Fri, 30 Jun 2017 22:33:27 +0000 (22:33 +0000)]
Merge "Add version info for C++ versions of basename, strchrnul."

7 years agoAdd version info for C++ versions of basename, strchrnul.
Josh Gao [Fri, 30 Jun 2017 20:20:28 +0000 (13:20 -0700)]
Add version info for C++ versions of basename, strchrnul.

These still won't get guards added by the preprocessor, because it
compiles with C-only.

Bug: https://github.com/android-ndk/ndk/issues/440
Test: treehugger
Change-Id: I893b345e528ed1b761e0db00700037411bbb8b78

7 years agoMerge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"" am: 1378c...
Roozbeh Pournader [Fri, 30 Jun 2017 01:30:08 +0000 (01:30 +0000)]
Merge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"" am: 1378c8710d am: 8804191c73
am: c005d49770

Change-Id: I594cfc8b1badbe0662ce4a9e5cc1bb605d36ed47

7 years agoMerge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"" am: 1378c...
Roozbeh Pournader [Fri, 30 Jun 2017 01:26:18 +0000 (01:26 +0000)]
Merge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"" am: 1378c8710d
am: 8804191c73

Change-Id: I79ef5f48a961d3af44e5732ffe94bf376c164214

7 years agoMerge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses""
Roozbeh Pournader [Fri, 30 Jun 2017 01:22:18 +0000 (01:22 +0000)]
Merge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses""
am: 1378c8710d

Change-Id: Ida59ed2311fe86f176af3d5d46b556c0d4987647

7 years agoMerge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses""
Roozbeh Pournader [Fri, 30 Jun 2017 01:10:10 +0000 (01:10 +0000)]
Merge "Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses""

7 years agoRevert "arm64: expand CFI shadow to cover 48-bit virtual addresses"
Elliott Hughes [Thu, 29 Jun 2017 23:48:43 +0000 (23:48 +0000)]
Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"

This reverts commit ae735163e51fbc7cac4217ce392c4894efdfc5a7.

QA claims this causes:

  AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.media.MediaPlayer.setSurface(android.view.Surface)' on a null object reference
  AndroidRuntime:        at com.android.setupwizardlib....

Bug: http://b/63141434
Change-Id: I05a6849471623d4cde8b254b1020b0ccbd84b699

7 years agoMerge "bionic: fix assorted static analyzer warnings" am: e202036e03 am: f437c90407
George Burgess IV [Thu, 29 Jun 2017 16:42:12 +0000 (16:42 +0000)]
Merge "bionic: fix assorted static analyzer warnings" am: e202036e03 am: f437c90407
am: dbcbeaa5da

Change-Id: I44f5895417f328197090c1ed69e97a1984f4856f

7 years agoMerge "bionic: fix assorted static analyzer warnings" am: e202036e03
George Burgess IV [Thu, 29 Jun 2017 16:38:13 +0000 (16:38 +0000)]
Merge "bionic: fix assorted static analyzer warnings" am: e202036e03
am: f437c90407

Change-Id: I18bb2720efba2904c5dec7de5255d51d1136a7a7

7 years agoMerge "bionic: fix assorted static analyzer warnings"
George Burgess IV [Thu, 29 Jun 2017 16:34:13 +0000 (16:34 +0000)]
Merge "bionic: fix assorted static analyzer warnings"
am: e202036e03

Change-Id: I88dce02b7f483fb7bc2819406d800d5056c2fc48

7 years agoMerge "bionic: fix assorted static analyzer warnings"
Treehugger Robot [Thu, 29 Jun 2017 16:27:52 +0000 (16:27 +0000)]
Merge "bionic: fix assorted static analyzer warnings"

7 years agoMerge "arm64: expand CFI shadow to cover 48-bit virtual addresses" am: 03c379971e...
Elliott Hughes [Thu, 29 Jun 2017 15:40:10 +0000 (15:40 +0000)]
Merge "arm64: expand CFI shadow to cover 48-bit virtual addresses" am: 03c379971e am: d9c7a8bb08
am: 12d57e9714

Change-Id: I298ac7949cab7b08cab54846a7dc3274336cbc5b

7 years agoMerge "arm64: expand CFI shadow to cover 48-bit virtual addresses" am: 03c379971e
Elliott Hughes [Thu, 29 Jun 2017 15:36:09 +0000 (15:36 +0000)]
Merge "arm64: expand CFI shadow to cover 48-bit virtual addresses" am: 03c379971e
am: d9c7a8bb08

Change-Id: I5431ecb4c543d8e770a8127c19457d5d86f06f0f

7 years agoMerge "arm64: expand CFI shadow to cover 48-bit virtual addresses"
Elliott Hughes [Thu, 29 Jun 2017 15:31:39 +0000 (15:31 +0000)]
Merge "arm64: expand CFI shadow to cover 48-bit virtual addresses"
am: 03c379971e

Change-Id: Iaf4266876e8052243668ba9cf1a4dea94ff9dfab

7 years agoMerge "arm64: expand CFI shadow to cover 48-bit virtual addresses"
Elliott Hughes [Thu, 29 Jun 2017 15:23:32 +0000 (15:23 +0000)]
Merge "arm64: expand CFI shadow to cover 48-bit virtual addresses"

7 years agoMerge "Put back more legacy pthread APIs." am: fa21a80407 am: f5db773a0b
Dan Albert [Thu, 29 Jun 2017 00:53:14 +0000 (00:53 +0000)]
Merge "Put back more legacy pthread APIs." am: fa21a80407 am: f5db773a0b
am: 2b3b4fbfc0

Change-Id: I5a24dd4e91f40dd15e05e5eed2be7d859b2ca320

7 years agoMerge "Put back more legacy pthread APIs." am: fa21a80407
Dan Albert [Thu, 29 Jun 2017 00:49:50 +0000 (00:49 +0000)]
Merge "Put back more legacy pthread APIs." am: fa21a80407
am: f5db773a0b

Change-Id: Ibea1b04e303cbc99b7110d1434aac21e24889d21

7 years agoMerge "Put back more legacy pthread APIs."
Dan Albert [Thu, 29 Jun 2017 00:45:26 +0000 (00:45 +0000)]
Merge "Put back more legacy pthread APIs."
am: fa21a80407

Change-Id: If4d58f388f987f58d9f4b91b7722a28d0f5bf73b

7 years agoMerge "Put back more legacy pthread APIs."
Treehugger Robot [Thu, 29 Jun 2017 00:39:30 +0000 (00:39 +0000)]
Merge "Put back more legacy pthread APIs."

7 years agobionic: fix assorted static analyzer warnings
George Burgess IV [Tue, 27 Jun 2017 23:23:45 +0000 (16:23 -0700)]
bionic: fix assorted static analyzer warnings

Warnings:

bionic/libc/bionic/fts.c:722:5: warning: Null passed to a callee that
requires a non-null 1st parameter

bionic/libc/bionic/sched_cpualloc.c:34:25: warning: Result of 'malloc'
is converted to a pointer of type 'cpu_set_t', which is incompatible
with sizeof operand type 'unsigned long'

bionic/linker/linker_main.cpp:315:7: warning: Access to field 'e_type'
results in a dereference of a null pointer (loaded from variable
'elf_hdr')

bionic/linker/linker_main.cpp:493:66: warning: Access to field 'e_phoff'
results in a dereference of a null pointer (loaded from variable
'elf_hdr')

bionic/linker/linker_main.cpp:90:14: warning: Access to field 'next'
results in a dereference of a null pointer (loaded from variable 'prev')

Bug: None
Test: mma; analyzer warnings are gone. CtsBionicTestCases pass.
Change-Id: I699a60c2c6f64c50b9ea06848a680c98a8abb44a

7 years agoarm64: expand CFI shadow to cover 48-bit virtual addresses
Kevin Brodsky [Mon, 26 Jun 2017 10:46:02 +0000 (11:46 +0100)]
arm64: expand CFI shadow to cover 48-bit virtual addresses

Starting from Linux 4.7, arm64's defconfig enables 48-bit VAs, see:
https://git.kernel.org/torvalds/c/211102d8

On arm64, the CFI shadow configuration currently assumes that VAs
are 39-bit long, and as expected this results in a segfault on a
(defconfig) 4.7+ kernel, when linking a CFI-enabled library.

Consequently, this change increases the max target address to
account for the new max VA size.

Change-Id: I3fb808563fa77a457c65e9663da0613117332072

7 years agoMerge "Enable dlfcn.dt_runpath_absolute_path in glibc tests" am: 291e895b37 am: d24ff...
Dimitry Ivanov [Tue, 27 Jun 2017 20:04:22 +0000 (20:04 +0000)]
Merge "Enable dlfcn.dt_runpath_absolute_path in glibc tests" am: 291e895b37 am: d24ffb697b
am: a376384164

Change-Id: I1db1c89db594e4eab59869bc21a9f71744e7c12c

7 years agoMerge "Enable dlfcn.dt_runpath_absolute_path in glibc tests" am: 291e895b37
Dimitry Ivanov [Tue, 27 Jun 2017 20:00:53 +0000 (20:00 +0000)]
Merge "Enable dlfcn.dt_runpath_absolute_path in glibc tests" am: 291e895b37
am: d24ffb697b

Change-Id: I4a50598fe4e203bb17c3e0288b4e081d71904e0f

7 years agoMerge "Enable dlfcn.dt_runpath_absolute_path in glibc tests"
Dimitry Ivanov [Tue, 27 Jun 2017 19:56:24 +0000 (19:56 +0000)]
Merge "Enable dlfcn.dt_runpath_absolute_path in glibc tests"
am: 291e895b37

Change-Id: Id8ced96e8189dce17a1636aa30effbbb65121df2

7 years agoMerge "Enable dlfcn.dt_runpath_absolute_path in glibc tests"
Treehugger Robot [Tue, 27 Jun 2017 19:46:28 +0000 (19:46 +0000)]
Merge "Enable dlfcn.dt_runpath_absolute_path in glibc tests"

7 years agoEnable dlfcn.dt_runpath_absolute_path in glibc tests
Dimitry Ivanov [Tue, 27 Jun 2017 18:02:51 +0000 (11:02 -0700)]
Enable dlfcn.dt_runpath_absolute_path in glibc tests

dlfcn.dt_runpath_absolute_path no longer fails when
running bionic-unit-tests on glibc

Bug: http://b/25320359
Test: bionic-unit-tests-glibc --gtest_filter=dlfcn.dt*
Change-Id: Ia0ecf43293cb0fed28516fd8cb87e7f5f2d6e648

7 years agoMerge "Shave another uninteresting stack frame off aborts." into oc-dr1-dev
Elliott Hughes [Fri, 23 Jun 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Shave another uninteresting stack frame off aborts." into oc-dr1-dev
am: 8c2847a547

Change-Id: Iad8af6b5e8f9c182e8ad9bfd682463db9bf8fa67

7 years agoMerge "Shave another uninteresting stack frame off aborts." into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 20:28:29 +0000 (20:28 +0000)]
Merge "Shave another uninteresting stack frame off aborts." into oc-dr1-dev

7 years agoExpand Seccomp whitelist am: c0c56ec7ce
Paul Lawrence [Fri, 23 Jun 2017 19:42:35 +0000 (19:42 +0000)]
Expand Seccomp whitelist am: c0c56ec7ce
am: e9b7f677a9

Change-Id: I298aaf62add5c0d010d9c4b0a9c1c020911d6d25

7 years agoExpand Seccomp whitelist am: c0c56ec7ce
Paul Lawrence [Fri, 23 Jun 2017 19:37:46 +0000 (19:37 +0000)]
Expand Seccomp whitelist am: c0c56ec7ce
am: edf64fc5f2

Change-Id: I783f1d490657daef34e43521c9ca8f026a3abac3

7 years agoExpand Seccomp whitelist
Paul Lawrence [Fri, 23 Jun 2017 19:34:18 +0000 (19:34 +0000)]
Expand Seccomp whitelist
am: c0c56ec7ce

Change-Id: I1a805666d3e1ac2d6a5f8d824ffdfa44fa12b6fd

7 years agoExpand Seccomp whitelist
Paul Lawrence [Fri, 23 Jun 2017 19:28:15 +0000 (19:28 +0000)]
Expand Seccomp whitelist
am: c0c56ec7ce

Change-Id: Ic29b7a227acae74444c1534ccc9366b1891ce3bf

7 years agoExpand Seccomp whitelist
Paul Lawrence [Fri, 23 Jun 2017 15:10:18 +0000 (08:10 -0700)]
Expand Seccomp whitelist

This seccomp failure is in the fault handler:

05-25 12:03:25.042 10201 27425 27425 F DEBUG   : backtrace:
05-25 12:03:25.042 10201 27425 27425 F DEBUG   :     #00 pc 00015380
/data/data/redacted/files/storage/lib/libcrashsdk.so

So whenever an app using this crash sdk crashes it looks like a seccomp
problem.  Fixing this won't stop the apps crashing, but will make the
crash reports accurate and useful.

So yes, the bug below is already fixed, but this issue has come back 2
or 3 times with different apps (b/62090571, b/62874867). This change
doesn't fix that crash either, but again it improves the reporting.

Bug: 62947697
Test: Device boots, app still fails but no longer with SECCOMP error
Change-Id: Ie0f8dc965001c8bc43f6a545b35bdcd38f006213

7 years agoMerge "Expand Seccomp whitelist" am: 82d746fb39 am: 7b10c361cd
Paul Lawrence [Fri, 23 Jun 2017 17:54:26 +0000 (17:54 +0000)]
Merge "Expand Seccomp whitelist" am: 82d746fb39 am: 7b10c361cd
am: 26aa3255fd

Change-Id: Ia2345b16277617462a74f3d89c2d7c8367a77161

7 years agoMerge "Expand Seccomp whitelist" am: 82d746fb39
Paul Lawrence [Fri, 23 Jun 2017 17:49:29 +0000 (17:49 +0000)]
Merge "Expand Seccomp whitelist" am: 82d746fb39
am: 7b10c361cd

Change-Id: Id74bec1070f30129dac6db0817617fbd005708d4

7 years agoShave another uninteresting stack frame off aborts.
Elliott Hughes [Tue, 20 Jun 2017 21:26:56 +0000 (14:26 -0700)]
Shave another uninteresting stack frame off aborts.

With this, stack frame 0 is the abort, not tgkill.

arm:

     #00 pc 0001a41c  /system/lib/libc.so (abort+63)

arm64:

     #00 pc 000000000001d75c  /system/lib64/libc.so (abort+120)

Also "include what you use" for <sys/syscall.h>.

(cherry picked from commit d7c52625f2da8322b4f0adb4c67674f0d66e619a)

Bug: 62810360
Test: ran `crasher abort` and `crasher64 abort`
Change-Id: I6517ac67b39b4133e890d52efc115071c812958b

7 years agoMerge "Expand Seccomp whitelist"
Paul Lawrence [Fri, 23 Jun 2017 17:44:29 +0000 (17:44 +0000)]
Merge "Expand Seccomp whitelist"
am: 82d746fb39

Change-Id: Icf85aa19e6e13dac32f16fb10f0f9140c435db25

7 years agoMerge "Expand Seccomp whitelist"
Treehugger Robot [Fri, 23 Jun 2017 17:39:05 +0000 (17:39 +0000)]
Merge "Expand Seccomp whitelist"

7 years agoExpand Seccomp whitelist
Paul Lawrence [Fri, 23 Jun 2017 15:10:18 +0000 (08:10 -0700)]
Expand Seccomp whitelist

This seccomp failure is in the fault handler:

05-25 12:03:25.042 10201 27425 27425 F DEBUG   : backtrace:
05-25 12:03:25.042 10201 27425 27425 F DEBUG   :     #00 pc 00015380
/data/data/redacted/files/storage/lib/libcrashsdk.so

So whenever an app using this crash sdk crashes it looks like a seccomp
problem.  Fixing this won't stop the apps crashing, but will make the
crash reports accurate and useful.

So yes, the bug below is already fixed, but this issue has come back 2
or 3 times with different apps (latest is b/62874867). This change
doesn't fix that crash either, but again it improves the reporting.

Bug: 62090571
Test: Device boots, app still fails but no longer with SECCOMP error
Change-Id: Ie0f8dc965001c8bc43f6a545b35bdcd38f006213

7 years agoMerge "Whitelist __NR__newselect. am: d87e5aa769 am: 1706fa1be3 -s ours" into oc...
Android Build Merger (Role) [Fri, 23 Jun 2017 06:21:20 +0000 (06:21 +0000)]
Merge "Whitelist __NR__newselect. am: d87e5aa769 am: 1706fa1be3  -s ours" into oc-dr1-dev-plus-aosp

7 years agoWhitelist __NR__newselect. am: d87e5aa769
Josh Gao [Fri, 23 Jun 2017 06:21:07 +0000 (06:21 +0000)]
Whitelist __NR__newselect. am: d87e5aa769
am: 1706fa1be3  -s ours

Change-Id: I59eac959e7cb53a4dd601b9a5a4750141daa65d9