OSDN Git Service

android-x86/bionic.git
8 years agoMerge \\\\"Add the record alloc option.\\\\" am: 779aa5ac33 am: 1d9f403ec4 am: 7db8f5ecfb
Christopher Ferris [Fri, 8 Jul 2016 22:12:33 +0000 (22:12 +0000)]
Merge \\\\"Add the record alloc option.\\\\" am: 779aa5ac33 am: 1d9f403ec4 am: 7db8f5ecfb
am: 6e709b5a16

Change-Id: I8ca4da802ab2eed55af2f8b4e549c0e84e1b4ec0

8 years agoMerge \\\"Add the record alloc option.\\\" am: 779aa5ac33 am: 1d9f403ec4
Christopher Ferris [Fri, 8 Jul 2016 22:09:43 +0000 (22:09 +0000)]
Merge \\\"Add the record alloc option.\\\" am: 779aa5ac33 am: 1d9f403ec4
am: 7db8f5ecfb

Change-Id: I4e7d7ace7f582e6a3f89c71ff5b4466d161c2dd8

8 years agoMerge \\"Add the record alloc option.\\" am: 779aa5ac33
Christopher Ferris [Fri, 8 Jul 2016 22:07:24 +0000 (22:07 +0000)]
Merge \\"Add the record alloc option.\\" am: 779aa5ac33
am: 1d9f403ec4

Change-Id: I783522616837b54b695fa1cc9f480c7264d6c238

8 years agoMerge \"Add the record alloc option.\"
Christopher Ferris [Fri, 8 Jul 2016 22:05:00 +0000 (22:05 +0000)]
Merge \"Add the record alloc option.\"
am: 779aa5ac33

Change-Id: Icdda3305fef2804b92692b31459fcfde2c83de1c

8 years agoMerge "Add the record alloc option."
Treehugger Robot [Fri, 8 Jul 2016 21:59:18 +0000 (21:59 +0000)]
Merge "Add the record alloc option."

8 years agoAdd the record alloc option.
Christopher Ferris [Wed, 20 Apr 2016 19:30:58 +0000 (12:30 -0700)]
Add the record alloc option.

This option adds the ability to record all of the allocation requests
and dump them to a file when a signal is sent to the process.

Included in this change, redo the option processing to add a new
string option.

Bug: 27747898

Change-Id: Ida043362e38b5eb1d459c99db9c2581015dab366

8 years agoMerge \"Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7...
Neil Fuller [Thu, 7 Jul 2016 16:14:05 +0000 (16:14 +0000)]
Merge \"Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828 am: 8fce5a6558\" into nyc-mr1-dev-plus-aosp
am: 08bcdf6326

Change-Id: I6d5c48cf003f739877c5c54badd76ba83fe497b3

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3...
Neil Fuller [Thu, 7 Jul 2016 16:13:58 +0000 (16:13 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828 am: 61e618227d
am: 64754e464c

Change-Id: I1216a89f9ad70c5beb526da682dd8e48b769fd2b

8 years agoMerge "Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7...
Android Build Merger (Role) [Thu, 7 Jul 2016 16:10:59 +0000 (16:10 +0000)]
Merge "Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828 am: 8fce5a6558" into nyc-mr1-dev-plus-aosp

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828
Neil Fuller [Thu, 7 Jul 2016 16:10:37 +0000 (16:10 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828
am: 8fce5a6558

Change-Id: Ia9b98d9acb658e7b02a5729411fc70736a85ba23

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828
Neil Fuller [Thu, 7 Jul 2016 16:10:35 +0000 (16:10 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7 am: bc1ce3b828
am: 61e618227d

Change-Id: Ia88063a465b3241773cf0a714f4134c5d99428b5

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7
Neil Fuller [Thu, 7 Jul 2016 16:07:49 +0000 (16:07 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7
am: bc1ce3b828

Change-Id: I61c8c4b1d68053cc7bc5dbfbbdc1e6b90824b81e

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7
Neil Fuller [Thu, 7 Jul 2016 16:07:46 +0000 (16:07 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7 am: a884aa8df7
am: bc1ce3b828

Change-Id: I7cfc0bb7755fb4c0559c79ec458610a59c398482

8 years agoUpdate timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7
Neil Fuller [Thu, 7 Jul 2016 16:05:31 +0000 (16:05 +0000)]
Update timezone data to 2016f am: 88d23859e0 am: 6c4968a6e7
am: a884aa8df7

Change-Id: I84612c410e4fea54733ed340b6a6695771bba4d9

8 years agoMerge \\\"Update timezone data to 2016f\\\" into stage-aosp-master am: f3cde2ba6b...
Neil Fuller [Thu, 7 Jul 2016 16:01:48 +0000 (16:01 +0000)]
Merge \\\"Update timezone data to 2016f\\\" into stage-aosp-master am: f3cde2ba6b am: 3f9c72e1d3
am: d5ba580314

Change-Id: I18b2e15e4c7f458ceb890229e6a3b15f3fd81782

8 years agoMerge \\"Update timezone data to 2016f\\" into stage-aosp-master am: f3cde2ba6b
Neil Fuller [Thu, 7 Jul 2016 15:59:00 +0000 (15:59 +0000)]
Merge \\"Update timezone data to 2016f\\" into stage-aosp-master am: f3cde2ba6b
am: 3f9c72e1d3

Change-Id: Ic271eeb1ccc126862fb68f142c2e0127dff4145d

8 years agoUpdate timezone data to 2016f am: 88d23859e0
Neil Fuller [Thu, 7 Jul 2016 15:58:57 +0000 (15:58 +0000)]
Update timezone data to 2016f am: 88d23859e0
am: 6c4968a6e7

Change-Id: I2b7bbc586b55719fd80d985c0972084dd25c7ada

8 years agoMerge \"Update timezone data to 2016f\" into stage-aosp-master
Neil Fuller [Thu, 7 Jul 2016 15:55:48 +0000 (15:55 +0000)]
Merge \"Update timezone data to 2016f\" into stage-aosp-master
am: f3cde2ba6b

Change-Id: I69ce5ade72d37cad860621530b820740377fa3b6

8 years agoUpdate timezone data to 2016f
Neil Fuller [Thu, 7 Jul 2016 15:55:47 +0000 (15:55 +0000)]
Update timezone data to 2016f
am: 88d23859e0

Change-Id: I3d0a9287cad7f6ec39174d58bf78f5c4b7e3d3e8

8 years agoMerge "Update timezone data to 2016f" into stage-aosp-master
Neil Fuller [Thu, 7 Jul 2016 15:50:37 +0000 (15:50 +0000)]
Merge "Update timezone data to 2016f" into stage-aosp-master

8 years agoMerge \\\\"Update timezone data to 2016f\\\\" am: a0e205e3b4 am: f1f8486776 am: 6b5fd...
Neil Fuller [Thu, 7 Jul 2016 15:22:11 +0000 (15:22 +0000)]
Merge \\\\"Update timezone data to 2016f\\\\" am: a0e205e3b4 am: f1f8486776 am: 6b5fd195a1
am: 09b2f9f084

Change-Id: I92b2d919c4637400174d5df1536ed7db75c1d01d

8 years agoMerge \\\"Update timezone data to 2016f\\\" am: a0e205e3b4 am: f1f8486776
Neil Fuller [Thu, 7 Jul 2016 15:18:51 +0000 (15:18 +0000)]
Merge \\\"Update timezone data to 2016f\\\" am: a0e205e3b4 am: f1f8486776
am: 6b5fd195a1

Change-Id: I0873f564edebf42e714904dbfd2022ae18045367

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 14:26:15 +0000 (15:26 +0100)]
Update timezone data to 2016f

The 2016f release of the tz code and data is available. It reflects the
following changes, which were either circulated on the tz mailing list
or are relatively minor technical or administrative changes:

   Changes affecting future time stamps

     The Egyptian government changed its mind on short notice, and
     Africa/Cairo will not introduce DST starting 2016-07-07 after all.
     (Thanks to Mina Samuel.)

     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
     (Thanks to Stepan Golosunov.)

   Changes to past and future time stamps

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

   Changes affecting past time stamps

     Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00
not 00:00.
     (Thanks to Stepan Golosunov.)

Note: Paul Eggert changed the key used to sign the tzdata bundle and
the new public key cannot be found. The changes to the data since
2016e have been verified visually.

Test: Ran CTS/android.core.tests.libcore.package.harmony_java_util
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_text
Test: Ran CTS/android.core.tests.libcore.package.libcore
Bug: 29991153
Bug: 30009483
(cherry picked from commit 516f09c963f4097e3fa0ee99a8d5537ecb56b2ab)

Change-Id: I3b1c9552ac7e1f9f436bd150d4c92916e54fc654

8 years agoMerge \\"Update timezone data to 2016f\\" am: a0e205e3b4
Neil Fuller [Thu, 7 Jul 2016 15:15:29 +0000 (15:15 +0000)]
Merge \\"Update timezone data to 2016f\\" am: a0e205e3b4
am: f1f8486776

Change-Id: I50f06068d9e7c261848e671e1ce99f09a6da67d4

8 years agoMerge \"Update timezone data to 2016f\"
Neil Fuller [Thu, 7 Jul 2016 15:13:12 +0000 (15:13 +0000)]
Merge \"Update timezone data to 2016f\"
am: a0e205e3b4

Change-Id: I6f76a9c1183b601810debfba7fddeb30e543c006

8 years agoMerge "Update timezone data to 2016f"
Neil Fuller [Thu, 7 Jul 2016 12:57:02 +0000 (12:57 +0000)]
Merge "Update timezone data to 2016f"

8 years agoUpdate timezone data to 2016f am: 510ac40370 am: e3387fe805
Neil Fuller [Wed, 6 Jul 2016 18:42:45 +0000 (18:42 +0000)]
Update timezone data to 2016f am: 510ac40370 am: e3387fe805
am: e3bd369f3a

Change-Id: I0bac892c2ec80ac1bad1acf7d109c983724bd7e3

8 years agoUpdate timezone data to 2016f am: 510ac40370
Neil Fuller [Wed, 6 Jul 2016 18:37:54 +0000 (18:37 +0000)]
Update timezone data to 2016f am: 510ac40370
am: e3387fe805

Change-Id: I3cdb43c56c16215c495b2d2c8651f03ccb875981

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 18:28:16 +0000 (18:28 +0000)]
Update timezone data to 2016f
am: 510ac40370

Change-Id: If2e0035cd268237fe9e6d237808025afb83afba4

8 years agoUpdate timezone data to 2016f am: 510ac40370 am: 6b2bbc6903
Neil Fuller [Wed, 6 Jul 2016 18:17:51 +0000 (18:17 +0000)]
Update timezone data to 2016f am: 510ac40370 am: 6b2bbc6903
am: 635815aaa4

Change-Id: I98784e324a72cfeeb8ea780a6d04981011055ea9

8 years agoUpdate timezone data to 2016f am: 510ac40370
Neil Fuller [Wed, 6 Jul 2016 18:13:13 +0000 (18:13 +0000)]
Update timezone data to 2016f am: 510ac40370
am: 6b2bbc6903

Change-Id: Icd5e8901ca9b30200f1a01b6b94d1d78e2d76ece

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 18:00:26 +0000 (18:00 +0000)]
Update timezone data to 2016f
am: 510ac40370

Change-Id: Ifcf36728c70db9432ce3d61bf56355b62a5a5bca

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 14:26:15 +0000 (15:26 +0100)]
Update timezone data to 2016f

The 2016f release of the tz code and data is available. It reflects the
following changes, which were either circulated on the tz mailing list
or are relatively minor technical or administrative changes:

   Changes affecting future time stamps

     The Egyptian government changed its mind on short notice, and
     Africa/Cairo will not introduce DST starting 2016-07-07 after all.
     (Thanks to Mina Samuel.)

     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
     (Thanks to Stepan Golosunov.)

   Changes to past and future time stamps

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

   Changes affecting past time stamps

     Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00
not 00:00.
     (Thanks to Stepan Golosunov.)

Note: Paul Eggert changed the key used to sign the tzdata bundle and
the new public key cannot be found. The changes to the data since
2016e have been verified visually.

Change-Id: I11b49d9916e67313978fd893acf091e9f99f6d33
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_util
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_text
Test: Ran CTS/android.core.tests.libcore.package.libcore
Bug: 29991153

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 14:26:15 +0000 (15:26 +0100)]
Update timezone data to 2016f

The 2016f release of the tz code and data is available. It reflects the
following changes, which were either circulated on the tz mailing list
or are relatively minor technical or administrative changes:

   Changes affecting future time stamps

     The Egyptian government changed its mind on short notice, and
     Africa/Cairo will not introduce DST starting 2016-07-07 after all.
     (Thanks to Mina Samuel.)

     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
     (Thanks to Stepan Golosunov.)

   Changes to past and future time stamps

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

   Changes affecting past time stamps

     Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00
not 00:00.
     (Thanks to Stepan Golosunov.)

Note: Paul Eggert changed the key used to sign the tzdata bundle and
the new public key cannot be found. The changes to the data since
2016e have been verified visually.

Change-Id: I30fd2a57fce7473b22ec80f713863ce502293ab9
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_util
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_text
Test: Ran CTS/android.core.tests.libcore.package.libcore
Bug: 29991153

8 years agoUpdate timezone data to 2016f
Neil Fuller [Wed, 6 Jul 2016 14:26:15 +0000 (15:26 +0100)]
Update timezone data to 2016f

The 2016f release of the tz code and data is available. It reflects the
following changes, which were either circulated on the tz mailing list
or are relatively minor technical or administrative changes:

   Changes affecting future time stamps

     The Egyptian government changed its mind on short notice, and
     Africa/Cairo will not introduce DST starting 2016-07-07 after all.
     (Thanks to Mina Samuel.)

     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
     (Thanks to Stepan Golosunov.)

   Changes to past and future time stamps

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

   Changes affecting past time stamps

     Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00
not 00:00.
     (Thanks to Stepan Golosunov.)

Note: Paul Eggert changed the key used to sign the tzdata bundle and
the new public key cannot be found. The changes to the data since
2016e have been verified visually.

Change-Id: I1767b5d0f7a11349ecd85c1c16942f4d73172dd0
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_util
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_text
Test: Ran CTS/android.core.tests.libcore.package.libcore
Bug: 29984514

8 years agoMerge \\\\"x86-64\\\\'s va_list is not a pointer type.\\\\" am: 204c4d1b80 am: 9d63da...
Elliott Hughes [Thu, 30 Jun 2016 21:04:29 +0000 (21:04 +0000)]
Merge \\\\"x86-64\\\\'s va_list is not a pointer type.\\\\" am: 204c4d1b80 am: 9d63da82fb am: 52f29cb19b
am: 4d34d57810

Change-Id: I23af73423aa3374591dfa1b2cd973ff979966c95

8 years agoMerge \\\\"Revert \\\\"Skip Clang\\\\'s integrated-as for hand-coded assembly\\\...
Pirama Arumuga Nainar [Thu, 30 Jun 2016 21:00:48 +0000 (21:00 +0000)]
Merge \\\\"Revert \\\\"Skip Clang\\\\'s integrated-as for hand-coded assembly\\\\"\\\\" am: 1fec29e77b am: a227bf399d am: a176406694
am: 83a8b07211

Change-Id: I0803f7168213d101657ba4b0c94159817492a151

8 years agoMerge \\\"x86-64\\\'s va_list is not a pointer type.\\\" am: 204c4d1b80 am: 9d63da82fb
Elliott Hughes [Thu, 30 Jun 2016 21:00:47 +0000 (21:00 +0000)]
Merge \\\"x86-64\\\'s va_list is not a pointer type.\\\" am: 204c4d1b80 am: 9d63da82fb
am: 52f29cb19b

Change-Id: I82df1176517dc2c2bd4d921de47502871108b991

8 years agoMerge \\\"Revert \\\"Skip Clang\\\'s integrated-as for hand-coded assembly\\\"\\...
Pirama Arumuga Nainar [Thu, 30 Jun 2016 20:57:02 +0000 (20:57 +0000)]
Merge \\\"Revert \\\"Skip Clang\\\'s integrated-as for hand-coded assembly\\\"\\\" am: 1fec29e77b am: a227bf399d
am: a176406694

Change-Id: Ie3eee5fad5c2f3476d32233e32a14c590dfcdc48

8 years agoMerge \\"x86-64\\'s va_list is not a pointer type.\\" am: 204c4d1b80
Elliott Hughes [Thu, 30 Jun 2016 20:57:01 +0000 (20:57 +0000)]
Merge \\"x86-64\\'s va_list is not a pointer type.\\" am: 204c4d1b80
am: 9d63da82fb

Change-Id: Id0d5df791909fd1b288781cd0e8898dc67c46cd8

8 years agoMerge \"x86-64\'s va_list is not a pointer type.\"
Elliott Hughes [Thu, 30 Jun 2016 20:53:18 +0000 (20:53 +0000)]
Merge \"x86-64\'s va_list is not a pointer type.\"
am: 204c4d1b80

Change-Id: I40675ac38f8442bb4ee66c048752919f7beb099e

8 years agoMerge \\"Revert \\"Skip Clang\\'s integrated-as for hand-coded assembly\\"\\" am...
Pirama Arumuga Nainar [Thu, 30 Jun 2016 20:53:16 +0000 (20:53 +0000)]
Merge \\"Revert \\"Skip Clang\\'s integrated-as for hand-coded assembly\\"\\" am: 1fec29e77b
am: a227bf399d

Change-Id: I0b663b17eee1cc3dc8f440dbce795ab49579c5fd

8 years agoMerge \"Revert \"Skip Clang\'s integrated-as for hand-coded assembly\"\"
Pirama Arumuga Nainar [Thu, 30 Jun 2016 20:49:36 +0000 (20:49 +0000)]
Merge \"Revert \"Skip Clang\'s integrated-as for hand-coded assembly\"\"
am: 1fec29e77b

Change-Id: I0e3caf46128a44f8cfdd167547817e2d8efe3b5c

8 years agoMerge "x86-64's va_list is not a pointer type."
Elliott Hughes [Thu, 30 Jun 2016 20:48:04 +0000 (20:48 +0000)]
Merge "x86-64's va_list is not a pointer type."

8 years agox86-64's va_list is not a pointer type.
Elliott Hughes [Thu, 30 Jun 2016 20:47:16 +0000 (13:47 -0700)]
x86-64's va_list is not a pointer type.

Change-Id: I680feeb641d5411ac481daaae6fa1580e74c5563

8 years agoMerge "Revert "Skip Clang's integrated-as for hand-coded assembly""
Treehugger Robot [Thu, 30 Jun 2016 20:33:41 +0000 (20:33 +0000)]
Merge "Revert "Skip Clang's integrated-as for hand-coded assembly""

8 years agoMerge \\\\"Apparently mips and x86\\\\'s va_list is a pointer type.\\\\" am: 60be638a...
Elliott Hughes [Thu, 30 Jun 2016 20:06:12 +0000 (20:06 +0000)]
Merge \\\\"Apparently mips and x86\\\\'s va_list is a pointer type.\\\\" am: 60be638ae6 am: 6c6a696332 am: 758add1a3a
am: c2c670994f

Change-Id: Ie9f0c2c7a37f9173671f45ec8b5f34873a4816e4

8 years agoMerge \\\"Apparently mips and x86\\\'s va_list is a pointer type.\\\" am: 60be638ae6...
Elliott Hughes [Thu, 30 Jun 2016 20:02:49 +0000 (20:02 +0000)]
Merge \\\"Apparently mips and x86\\\'s va_list is a pointer type.\\\" am: 60be638ae6 am: 6c6a696332
am: 758add1a3a

Change-Id: I39f815efad611438704c859747ebb040b8e69adf

8 years agoMerge \\"Apparently mips and x86\\'s va_list is a pointer type.\\" am: 60be638ae6
Elliott Hughes [Thu, 30 Jun 2016 19:59:13 +0000 (19:59 +0000)]
Merge \\"Apparently mips and x86\\'s va_list is a pointer type.\\" am: 60be638ae6
am: 6c6a696332

Change-Id: I8d3b50f19b8bf07583c797566d6234459cbdb66f

8 years agoMerge \"Apparently mips and x86\'s va_list is a pointer type.\"
Elliott Hughes [Thu, 30 Jun 2016 19:55:44 +0000 (19:55 +0000)]
Merge \"Apparently mips and x86\'s va_list is a pointer type.\"
am: 60be638ae6

Change-Id: I72cf962f53e703b2b52529f43cc2cf8b1ad106f3

8 years agoMerge "Apparently mips and x86's va_list is a pointer type."
Elliott Hughes [Thu, 30 Jun 2016 19:48:19 +0000 (19:48 +0000)]
Merge "Apparently mips and x86's va_list is a pointer type."

8 years agoApparently mips and x86's va_list is a pointer type.
Elliott Hughes [Thu, 30 Jun 2016 19:46:21 +0000 (12:46 -0700)]
Apparently mips and x86's va_list is a pointer type.

And clang won't let you have a function declaration where some arguments
have nullability specifiers and others don't.

Change-Id: I450b0221a3f7f068d5fe971dfbc0ba91d25710e8

8 years agoMerge \\\\"Remove __nonnull (in favor of _Nonnull).\\\\" am: 3b4e11faa8 am: f4d5d9e9c...
Elliott Hughes [Thu, 30 Jun 2016 18:32:28 +0000 (18:32 +0000)]
Merge \\\\"Remove __nonnull (in favor of _Nonnull).\\\\" am: 3b4e11faa8 am: f4d5d9e9c7 am: 8b80b39eba
am: 51ef97c1e5

Change-Id: I73edfeea18a5e92af839abe82a1e6e16f13bb190

8 years agoMerge \\\"Remove __nonnull (in favor of _Nonnull).\\\" am: 3b4e11faa8 am: f4d5d9e9c7
Elliott Hughes [Thu, 30 Jun 2016 18:25:39 +0000 (18:25 +0000)]
Merge \\\"Remove __nonnull (in favor of _Nonnull).\\\" am: 3b4e11faa8 am: f4d5d9e9c7
am: 8b80b39eba

Change-Id: Ie41205fa78a719f95f0f8faa2e9151bf1ce30c0e

8 years agoMerge \\"Remove __nonnull (in favor of _Nonnull).\\" am: 3b4e11faa8
Elliott Hughes [Thu, 30 Jun 2016 18:22:01 +0000 (18:22 +0000)]
Merge \\"Remove __nonnull (in favor of _Nonnull).\\" am: 3b4e11faa8
am: f4d5d9e9c7

Change-Id: I7a7ddb61c226c39be8ee9542f4d923a18394dc8f

8 years agoMerge \"Remove __nonnull (in favor of _Nonnull).\"
Elliott Hughes [Thu, 30 Jun 2016 18:18:38 +0000 (18:18 +0000)]
Merge \"Remove __nonnull (in favor of _Nonnull).\"
am: 3b4e11faa8

Change-Id: I5b844da400d21cc64730065f2f9a2111a89ea560

8 years agoMerge "Remove __nonnull (in favor of _Nonnull)."
Treehugger Robot [Thu, 30 Jun 2016 18:04:38 +0000 (18:04 +0000)]
Merge "Remove __nonnull (in favor of _Nonnull)."

8 years agoRemove __nonnull (in favor of _Nonnull).
Elliott Hughes [Thu, 30 Jun 2016 16:12:40 +0000 (09:12 -0700)]
Remove __nonnull (in favor of _Nonnull).

It's a dangerous pain in the ass, and we're only using it in one place, and
that's a mistake too.

Change-Id: Ida1d1286aaa1343bdee95fa092fcb45ff3258f77

8 years agoRevert "Skip Clang's integrated-as for hand-coded assembly"
Pirama Arumuga Nainar [Thu, 30 Jun 2016 00:16:54 +0000 (00:16 +0000)]
Revert "Skip Clang's integrated-as for hand-coded assembly"

This reverts commit 8d414dd2b1d9503f6d4b3d9310796be50a824ede.

Reverting this since https://android-review.googlesource.com/#/c/244800/ adds -fno-integrated-as globally.

Change-Id: I29f53a385c16f44ead5dc744b0f2dd18a4af1731

8 years agoMerge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53 am: 41ccbf9729
Josh Gao [Wed, 29 Jun 2016 22:03:19 +0000 (22:03 +0000)]
Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53 am: 41ccbf9729
am: cc44959be2

Change-Id: Idc6b11fda84d44156e30c665e6c2882c50330929

8 years agoMerge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53
Josh Gao [Wed, 29 Jun 2016 22:00:52 +0000 (22:00 +0000)]
Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53
am: 41ccbf9729

Change-Id: Ic0e62cf54e8254e04d61e020cdb0d2a08f0d6959

8 years agoMerge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db
Josh Gao [Wed, 29 Jun 2016 21:58:28 +0000 (21:58 +0000)]
Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db
am: d7fc79ad53

Change-Id: I2c2f4bbdc24b461570b380a67c553e2ce0abc936

8 years agoMerge changes I98c9329f,I40936f7b,I09d20ff1
Josh Gao [Wed, 29 Jun 2016 21:56:02 +0000 (21:56 +0000)]
Merge changes I98c9329f,I40936f7b,I09d20ff1
am: 1159c196db

Change-Id: Id118e7961eaeb3fa3f7c40abcbf158e45bee32f6

8 years agoMerge changes I98c9329f,I40936f7b,I09d20ff1
Treehugger Robot [Wed, 29 Jun 2016 21:45:34 +0000 (21:45 +0000)]
Merge changes I98c9329f,I40936f7b,I09d20ff1

* changes:
  Defer registration of the arc4random fork-detect handler.
  Make getpid work before the main thread is initialized.
  Take the arc4random lock before forking.

8 years agoDefer registration of the arc4random fork-detect handler.
Josh Gao [Fri, 24 Jun 2016 23:18:21 +0000 (16:18 -0700)]
Defer registration of the arc4random fork-detect handler.

Previously, arc4random would register a fork-detecting pthread_atfork
handler to not have to call getpid() after a fork. pthread_atfork uses
pthread_mutex_lock, which requires the current thread to be initialized,
preventing the use of arc4random for initializing the global stack guard,
which needs to happen before the main thread has been initialized.

Extract the arc4random fork-detection flag and use the existing
arc4random fork handler to set it.

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

8 years agoMake getpid work before the main thread is initialized.
Josh Gao [Fri, 24 Jun 2016 23:13:33 +0000 (16:13 -0700)]
Make getpid work before the main thread is initialized.

Bug: http://b/29622562
Test: code dependent on this change no longer crashes
Change-Id: I40936f7b35d9e58182aeb2e34e52f54088700825

8 years agoTake the arc4random lock before forking.
Josh Gao [Fri, 24 Jun 2016 20:04:09 +0000 (13:04 -0700)]
Take the arc4random lock before forking.

Bug: http://b/24675038
Test: stepped through a fork call in gdb
Change-Id: I09d20ff1d103d0c005f2a0cdd9b0a8710ab2392c

8 years agoMerge \\\\"Skip Clang\\\\'s integrated-as for hand-coded assembly\\\\" am: 9158386758...
Pirama Arumuga Nainar [Mon, 27 Jun 2016 22:58:48 +0000 (22:58 +0000)]
Merge \\\\"Skip Clang\\\\'s integrated-as for hand-coded assembly\\\\" am: 9158386758 am: 476b301eb1 am: daf8534c0f
am: 9fc378632b

Change-Id: I2eed9c3d4dbacd064b9dde7d47d3e73d1679a04b

8 years agoMerge \\\"Skip Clang\\\'s integrated-as for hand-coded assembly\\\" am: 9158386758...
Pirama Arumuga Nainar [Mon, 27 Jun 2016 22:53:46 +0000 (22:53 +0000)]
Merge \\\"Skip Clang\\\'s integrated-as for hand-coded assembly\\\" am: 9158386758 am: 476b301eb1
am: daf8534c0f

Change-Id: Ia0397bf7c345aa952769d62e5cd151d067c6bf1c

8 years agoMerge \\"Skip Clang\\'s integrated-as for hand-coded assembly\\" am: 9158386758
Pirama Arumuga Nainar [Mon, 27 Jun 2016 22:51:14 +0000 (22:51 +0000)]
Merge \\"Skip Clang\\'s integrated-as for hand-coded assembly\\" am: 9158386758
am: 476b301eb1

Change-Id: Ia8c325990aa409f3d89ecd12689b0e0f8ef52778

8 years agoMerge \"Skip Clang\'s integrated-as for hand-coded assembly\"
Pirama Arumuga Nainar [Mon, 27 Jun 2016 22:48:43 +0000 (22:48 +0000)]
Merge \"Skip Clang\'s integrated-as for hand-coded assembly\"
am: 9158386758

Change-Id: Iccc7a425b1b68903db309efb8385e19ee8edeb4f

8 years agoMerge "Skip Clang's integrated-as for hand-coded assembly"
Treehugger Robot [Mon, 27 Jun 2016 22:39:48 +0000 (22:39 +0000)]
Merge "Skip Clang's integrated-as for hand-coded assembly"

8 years agoSkip Clang's integrated-as for hand-coded assembly
Pirama Arumuga Nainar [Sat, 25 Jun 2016 19:53:06 +0000 (12:53 -0700)]
Skip Clang's integrated-as for hand-coded assembly

Bug: http://b/28149048
Bug: http://b/29771478

Clang recently switched to using integrated assembler for Mips.
However, it fails to compile some of the hand-coded assembly files in
bionic.  Disable integrated-as for the time being.

Change-Id: I2eed4391f6827224da74383387bdd9105de5a857

8 years agoMerge \\\\"Update timezone data to 2016e\\\\" am: bb400855c3 am: 365dbece7f am: 5ba23...
Neil Fuller [Fri, 24 Jun 2016 09:53:44 +0000 (09:53 +0000)]
Merge \\\\"Update timezone data to 2016e\\\\" am: bb400855c3 am: 365dbece7f am: 5ba235d6ac
am: 39fc7a8b5a

Change-Id: I497b128fcc808891ca01c1cca5a2e26cb3b762ce

8 years agoMerge \\\"Update timezone data to 2016e\\\" am: bb400855c3 am: 365dbece7f
Neil Fuller [Fri, 24 Jun 2016 09:49:40 +0000 (09:49 +0000)]
Merge \\\"Update timezone data to 2016e\\\" am: bb400855c3 am: 365dbece7f
am: 5ba235d6ac

Change-Id: If1a7e367aae576ceec52dc9dac85e824ffa43850

8 years agoMerge \\"Update timezone data to 2016e\\" am: bb400855c3
Neil Fuller [Fri, 24 Jun 2016 09:45:38 +0000 (09:45 +0000)]
Merge \\"Update timezone data to 2016e\\" am: bb400855c3
am: 365dbece7f

Change-Id: Ifa37018de37079ec1e67fa9b5dbee5e80a4b539f

8 years agoMerge \"Update timezone data to 2016e\"
Neil Fuller [Fri, 24 Jun 2016 09:42:08 +0000 (09:42 +0000)]
Merge \"Update timezone data to 2016e\"
am: bb400855c3

Change-Id: Ideb25d2e0d74e9e73d38ecaa5300e82b85a01972

8 years agoMerge "Update timezone data to 2016e"
Neil Fuller [Fri, 24 Jun 2016 09:02:03 +0000 (09:02 +0000)]
Merge "Update timezone data to 2016e"

8 years agoUpdate timezone data to 2016e
Neil Fuller [Wed, 15 Jun 2016 13:55:44 +0000 (14:55 +0100)]
Update timezone data to 2016e

  Changes affecting future time stamps

    Africa/Cairo observes DST in 2016 from July 7 to the end of October.
    Guess October 27 and 24:00 transitions. (Thanks to Steffen Thorsen.)
    For future years, guess April's last Thursday to October's last
    Thursday except for Ramadan.

  Changes affecting past time stamps

    Locations while uninhabited now use '-00', not 'zzz', as a
    placeholder time zone abbreviation.  This is inspired by Internet
    RFC 3339 and is more consistent with numeric time zone
    abbreviations already used elsewhere.  The change affects several
    arctic and antarctic locations, e.g., America/Cambridge_Bay before
    1920 and Antarctica/Troll before 2005.

    Asia/Baku's 1992-09-27 transition from +04 (DST) to +04 (non-DST) was
    at 03:00, not 23:00 the previous day.  (Thanks to Michael Deckers.)

Bug: 29354265
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_util
Test: Ran CTS/android.core.tests.libcore.package.harmony_java_text
Test: Ran CTS/android.core.tests.libcore.package.libcore
(cherry picked from commit 1b0ee2041c5ccf4053be8648e0cfbe45c102aeb7)

Change-Id: I00b892b160769faae6fc8e0df2a58211a43bc1a0

8 years agoMerge \"Merge \\\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\\" into marshma...
Daniel Xie [Wed, 22 Jun 2016 21:48:51 +0000 (21:48 +0000)]
Merge \"Merge \\\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62 am: bec2d19a54\" into nyc-mr1-dev-plus-aosp
am: 294cbf26c2  -s ours

Change-Id: Iba28569ed8e5bfdc4556d5c59f923f8b99c24d9e

8 years agoMerge \\\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\\" into marshmallow...
Daniel Xie [Wed, 22 Jun 2016 21:48:51 +0000 (21:48 +0000)]
Merge \\\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62 am: ffcfeba5fb
am: 59a7f49d94  -s ours

Change-Id: I3943e92db7342b29d17f7c77fb153b9f2075f197

8 years agoMerge "Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallo...
Android Build Merger (Role) [Wed, 22 Jun 2016 21:46:30 +0000 (21:46 +0000)]
Merge "Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62 am: bec2d19a54" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts...
Daniel Xie [Wed, 22 Jun 2016 21:46:17 +0000 (21:46 +0000)]
Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62
am: ffcfeba5fb

Change-Id: I5dc47c65c3f72f673da8140e3fa7ed89e0bbb0ec

8 years agoMerge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts...
Daniel Xie [Wed, 22 Jun 2016 21:46:17 +0000 (21:46 +0000)]
Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62
am: bec2d19a54

Change-Id: I8f815f47108943f4fe9d6254b86f18b59b667779

8 years agoMerge \\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\" into marshmallow-cts...
Daniel Xie [Wed, 22 Jun 2016 21:43:30 +0000 (21:43 +0000)]
Merge \\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours
am: 3593c2fa62

Change-Id: I602665fc0786a47555fb2a2b8d36d0d2127a70e7

8 years agoMerge \\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\" into marshmallow-cts...
Daniel Xie [Wed, 22 Jun 2016 21:43:30 +0000 (21:43 +0000)]
Merge \\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours
am: 3593c2fa62

Change-Id: Idffbbfeef086b67c22a24780c4bd4bcc5fd33911

8 years agoMerge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into marshmallow-cts-dev...
Daniel Xie [Wed, 22 Jun 2016 21:41:07 +0000 (21:41 +0000)]
Merge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be
am: e8be35da77  -s ours

Change-Id: I177ca0c55de3b54bd764f6eddf8749325b6cb3f4

8 years agoMerge \\\\"DO NOT MERGE: push out fix for data dir.\\\\" into marshmallow-cts-dev...
Daniel Xie [Wed, 22 Jun 2016 21:38:36 +0000 (21:38 +0000)]
Merge \\\\"DO NOT MERGE: push out fix for data dir.\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417
am: 9ced3475be

Change-Id: Ie4afe19fe05d760ce22246fb98ef9f5a8a8a88d2

8 years agoMerge \\\"DO NOT MERGE: push out fix for data dir.\\\" into marshmallow-cts-dev am...
Daniel Xie [Wed, 22 Jun 2016 21:36:06 +0000 (21:36 +0000)]
Merge \\\"DO NOT MERGE: push out fix for data dir.\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659
am: 99a49f5417

Change-Id: I60161d61084359f0ae74c2fdfd9e75b6af5b24d3

8 years agoMerge \\"DO NOT MERGE: push out fix for data dir.\\" into marshmallow-cts-dev am...
Daniel Xie [Wed, 22 Jun 2016 21:33:39 +0000 (21:33 +0000)]
Merge \\"DO NOT MERGE: push out fix for data dir.\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours
am: d986ba2659

Change-Id: I670ae33ee552d13a25f1071ce042015baf470e22

8 years agoMerge \"DO NOT MERGE: push out fix for data dir.\" into marshmallow-cts-dev
Daniel Xie [Wed, 22 Jun 2016 21:31:10 +0000 (21:31 +0000)]
Merge \"DO NOT MERGE: push out fix for data dir.\" into marshmallow-cts-dev
am: f09a2ff2e6  -s ours

Change-Id: Icdb05b897a4877b86581b41d1dd7d1a14031172b

8 years agoMerge "DO NOT MERGE: push out fix for data dir." into marshmallow-cts-dev
Daniel Xie [Wed, 22 Jun 2016 21:22:03 +0000 (21:22 +0000)]
Merge "DO NOT MERGE: push out fix for data dir." into marshmallow-cts-dev

8 years agoDO NOT MERGE: push out fix for data dir.
Daniel Xie [Wed, 22 Jun 2016 21:19:01 +0000 (14:19 -0700)]
DO NOT MERGE: push out fix for data dir.

Change-Id: I97ff02676e7f6008c26ddb5c41eb113b4b62280f

8 years agoMerge \"Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab...
Neil Fuller [Wed, 22 Jun 2016 10:54:13 +0000 (10:54 +0000)]
Merge \"Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c am: 1f7d90c9e2\" into nyc-mr1-dev-plus-aosp
am: eb8d7b8cf9

Change-Id: I247f9537a353bd644ad84ad40b981408da611099

8 years agoUpdate timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb6...
Neil Fuller [Wed, 22 Jun 2016 10:54:03 +0000 (10:54 +0000)]
Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c am: c574c6e976
am: 1c3b4693e5

Change-Id: I5d1bfa08798c56d0e99aff9c08253b8c4ab29e2b

8 years agoMerge "Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab...
Android Build Merger (Role) [Wed, 22 Jun 2016 10:51:49 +0000 (10:51 +0000)]
Merge "Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c am: 1f7d90c9e2" into nyc-mr1-dev-plus-aosp

8 years agoUpdate timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c
Neil Fuller [Wed, 22 Jun 2016 10:51:28 +0000 (10:51 +0000)]
Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c
am: 1f7d90c9e2

Change-Id: I0397394e55b54eaa0ba2c1099debd2909638e315

8 years agoUpdate timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c
Neil Fuller [Wed, 22 Jun 2016 10:51:22 +0000 (10:51 +0000)]
Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab am: 378eb66e6c
am: c574c6e976

Change-Id: Ic39e86522b6cb61d3a36f0859dee1a0065206fb2

8 years agoUpdate timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab
Neil Fuller [Wed, 22 Jun 2016 10:48:32 +0000 (10:48 +0000)]
Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab
am: 378eb66e6c

Change-Id: I737d974a4dfbdd03188b7468dbfa3aa61ec70b6e

8 years agoUpdate timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab
Neil Fuller [Wed, 22 Jun 2016 10:48:27 +0000 (10:48 +0000)]
Update timezone data to 2016e am: 930bdf8e8c am: 65f57e4cea am: 6a0a02efab
am: 378eb66e6c

Change-Id: I71ce699be9c888029f0881af5f26d0b005c47d86