Commit Graph

6651 Commits

Author SHA1 Message Date
Christopher Ferris
40bc7cd4ed DO NOT MERGE Re-add .save directive for arm assembler code.
Restored the .save directives so that the libcorkscrew unwinder continues
to function.

Bug: 15701117
Change-Id: I853695a299548b84c78ae8147b9757dbeacdb1ec
2014-06-18 12:54:59 -07:00
Chad Brubaker
1d3d0360ee am 081db840: Allow overlap in resolv uid => DNS iface mapping
* commit '081db840befec895fb86e709ae95832ade2d065c':
  Allow overlap in resolv uid => DNS iface mapping
2014-03-21 21:02:40 +00:00
Chad Brubaker
081db840be Allow overlap in resolv uid => DNS iface mapping
When multiple rules exist covering a given uid the one added most
recently will be used.

This allows us to handle the simultaneous tuns case where a new tun is
coming online for an already running VPN.

_resolv_clear_iface_for_uid_range now also takes the iface and removes
only that matching (iface, uid range) entry.

Bug: 12134439
Change-Id: I9b9cfcfae2f38c409022a8c76ccadad7e2babd78
android-4.4.4_r2.0.1 android-4.4.4_r2 android-4.4.4_r1.0.1 android-4.4.4_r1 android-4.4.3_r1.1.0.1 android-4.4.3_r1.1 android-4.4.3_r1.0.1 android-4.4.3_r1 android-4.4w_r1 android-cts-4.4_r4
2014-03-15 15:29:01 -07:00
Elliott Hughes
9061c82991 am 04583ce9: Upgrade to tzdata2014a.
* commit '04583ce9b94d6f41f4c1e66939c4ca2ee41ff058':
  Upgrade to tzdata2014a.
2014-03-11 17:44:37 +00:00
Elliott Hughes
04583ce9b9 Upgrade to tzdata2014a.
From the release notes:

  Changes affecting near-future time stamps

    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin
    for the heads-up, and to Tim Parenti for simplifying the update.)

  Changes affecting past time stamps

    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled
    03:00.  (Thanks to Steffen Thorsen.)

    Ukraine switched from Moscow to Eastern European time on 1990-07-01
    (not 1992-01-01), and observed DST during the entire next winter.
    (Thanks to Vladimir in Moscow via Alois Treindl.)

    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to
    09-03.  (Thanks to Avigdor Finkelstein.)

(cherry picked from commit 159b28eb46)

Bug: 13193205
Change-Id: I3d302039f7e057a97c9d307ce8d32efa056481ed
2014-03-10 15:23:02 -07:00
Robert Greenwalt
8b6a965150 am c5443e6e: am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit 'c5443e6e516921bdb1862b85a52b873523427bea':
  Fix dns searchdomain use in gethostbyname.
2014-03-05 22:14:48 +00:00
Robert Greenwalt
c5443e6e51 am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit 'abf91850f96858a286de268267ca5cf337ec9a3b':
  Fix dns searchdomain use in gethostbyname.
2014-03-05 18:35:18 +00:00
Robert Greenwalt
abf91850f9 Merge "Fix dns searchdomain use in gethostbyname." into klp-dev 2014-03-05 18:26:27 +00:00
Elliott Hughes
e365f2840f am f27cc051: am 806f3bd7: Upgrade to tzdata2013i.
* commit 'f27cc051ec36809a64f8cc6a17fd39eca3516d1d':
  Upgrade to tzdata2013i.
2014-03-04 18:26:11 +00:00
Elliott Hughes
f27cc051ec am 806f3bd7: Upgrade to tzdata2013i.
* commit '806f3bd7aaec5b7444b1b218b69b3952386cb92f':
  Upgrade to tzdata2013i.
2014-03-04 18:22:45 +00:00
Elliott Hughes
806f3bd7aa Upgrade to tzdata2013i.
From the release notes:

  Changes affecting near-future time stamps:

    Jordan switches back to standard time at 00:00 on December 20, 2013.
    The 2006-2011 transition schedule is planned to resume in 2014.
    (Thanks to Steffen Thorsen.)

  Changes affecting past time stamps:

    In 2004, Cuba began DST on March 28, not April 4.
    (Thanks to Steffen Thorsen.)

Bug: 13193205
Change-Id: I8f26cc50f6b571804a18ff2113b4a47a22bc56dd
2014-02-25 22:47:29 +00:00
Elliott Hughes
82072dc932 am 12e3a501: am 037b10d0: Merge "Fix pthread_test to work with gtest 1.7.0."
* commit '12e3a5019a8bedcdac27470da92f81b5f7fd7b5b':
  Fix pthread_test to work with gtest 1.7.0.
2014-01-29 01:51:07 +00:00
Elliott Hughes
12e3a5019a am 037b10d0: Merge "Fix pthread_test to work with gtest 1.7.0."
* commit '037b10d05a789eb57878127ee4d69db1008e8c80':
  Fix pthread_test to work with gtest 1.7.0.
2014-01-29 01:47:11 +00:00
Elliott Hughes
037b10d05a Merge "Fix pthread_test to work with gtest 1.7.0." 2014-01-29 01:42:10 +00:00
Elliott Hughes
718a5b5495 Fix pthread_test to work with gtest 1.7.0.
Now we're building it correctly configured, gtest takes a couple of
TLS slots for itself.

Change-Id: I1c2c4e9e5f9c6e2e2e6ecd1214cfc16a5af5afed
2014-01-28 17:02:03 -08:00
Elliott Hughes
2db157c853 am 3bd75303: am c75e7726: Merge "Remove a __system_property_get call from the DNS code."
* commit '3bd75303f96a0838d971f98f941ee90bee6ba17d':
  Remove a __system_property_get call from the DNS code.
2014-01-28 23:11:07 +00:00
Elliott Hughes
3bd75303f9 am c75e7726: Merge "Remove a __system_property_get call from the DNS code."
* commit 'c75e7726ea5167ea03c512c7c35117762548d93f':
  Remove a __system_property_get call from the DNS code.
2014-01-28 23:04:52 +00:00
Elliott Hughes
c75e7726ea Merge "Remove a __system_property_get call from the DNS code." 2014-01-28 23:00:05 +00:00
Elliott Hughes
908e8c24ab Remove a __system_property_get call from the DNS code.
Change-Id: I48082ad9eb1b56349c6746ab2c371728c8571a81
2014-01-28 14:54:11 -08:00
Elliott Hughes
0aa8426944 am 7055c72a: am 4ea434e5: Merge "bionic: Change the type of soinfo\'s size to size_t"
* commit '7055c72a989188dd5e0984cc8cf6a2c0b2ffcc81':
  bionic: Change the type of soinfo's size to size_t
2014-01-28 21:17:06 +00:00
Elliott Hughes
7055c72a98 am 4ea434e5: Merge "bionic: Change the type of soinfo\'s size to size_t"
* commit '4ea434e5d22c8e257de3ff517fdda1175917b3ec':
  bionic: Change the type of soinfo's size to size_t
2014-01-28 21:10:19 +00:00
Elliott Hughes
4ea434e5d2 Merge "bionic: Change the type of soinfo's size to size_t" 2014-01-28 21:04:04 +00:00
Weiwu Chen
5ceb889ac9 bionic: Change the type of soinfo's size to size_t
Some system functions like munmap expect soinfo's size to be size_t, but currently
it is unsigned. Change it to size_t to fit 64bit's portability.

Change-Id: I0bf6d522b38b0cd9bf1db05b004b5326217412a2
Signed-off-by: Weiwu Chen <weiwu.chen@intel.com>
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-01-28 11:54:01 -08:00
Elliott Hughes
41ae96a1cc am 4bc229eb: am 4449fe96: Merge "Fix 32-bit mmap/mmap64 handling of negative offsets."
* commit '4bc229eb0228d0cfb5b58e87124e5473f3513f06':
  Fix 32-bit mmap/mmap64 handling of negative offsets.
2014-01-28 01:11:49 +00:00
Elliott Hughes
4bc229eb02 am 4449fe96: Merge "Fix 32-bit mmap/mmap64 handling of negative offsets."
* commit '4449fe9675671264746af4876bd959af8e9fee82':
  Fix 32-bit mmap/mmap64 handling of negative offsets.
2014-01-28 01:03:26 +00:00
Elliott Hughes
64989588ba am 2d7f9616: am 652dd519: Merge "Remove libthread_db from bionic."
* commit '2d7f9616fda2366845af3443c15eb3405eff9b6e':
  Remove libthread_db from bionic.
2014-01-28 00:59:14 +00:00
Elliott Hughes
4449fe9675 Merge "Fix 32-bit mmap/mmap64 handling of negative offsets." 2014-01-28 00:58:51 +00:00
Elliott Hughes
2d7f9616fd am 652dd519: Merge "Remove libthread_db from bionic."
* commit '652dd5196df87bdeef7bff452f1a4857a96e3133':
  Remove libthread_db from bionic.
2014-01-28 00:43:45 +00:00
Elliott Hughes
431166d995 Fix 32-bit mmap/mmap64 handling of negative offsets.
We don't actually need to worry about sign extension if we reject
negative values ourselves. Previously it was possible to come up
with negative but aligned values that we would pass to the kernel;
in the case of mmap (as opposed to mmap64) we'd incorrectly turn
those into large positive offsets.

Change-Id: I2aa583e0f892d59bb77429aea8730b72db32dcb0
2014-01-27 16:36:56 -08:00
Elliott Hughes
652dd5196d Merge "Remove libthread_db from bionic." 2014-01-28 00:24:57 +00:00
Elliott Hughes
d373d0c038 Remove libthread_db from bionic.
The NDK statically links its own copy into gdb.

Bug: 11882807
Change-Id: I0c7ed8761c32df3cc3644258551bc7d2e263f47b
2014-01-27 15:45:06 -08:00
Elliott Hughes
240a5214e9 am cbb439ad: am ba0c668f: Merge "bionic: Do not use magic number for portability"
* commit 'cbb439addbe9f04de28f291ebd163575933da177':
  bionic: Do not use magic number for portability
2014-01-27 23:05:21 +00:00
Elliott Hughes
cbb439addb am ba0c668f: Merge "bionic: Do not use magic number for portability"
* commit 'ba0c668feca851fd52359bee4174a232f27697b4':
  bionic: Do not use magic number for portability
2014-01-27 14:57:53 -08:00
Elliott Hughes
ba0c668fec Merge "bionic: Do not use magic number for portability" 2014-01-27 22:52:07 +00:00
Qiming Shi
4041b13c20 bionic: Do not use magic number for portability
Do not use the magic number 0xFFFFFFFFU to represent the max value of an address
as it's not correct on 64bit platform. We should use UINTPTR_MAX instead.

Change-Id: I1fc6f5864a651b2eddea2333cb0788f9d9223270
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
Signed-off-by: Weiwu Chen <weiwu.chen@intel.com>
2014-01-27 14:51:07 -08:00
Elliott Hughes
e528d1787c am f3ea7917: am 6f23ce36: Merge "Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64)."
* commit 'f3ea791757dacdab64c870ccfb820e3e36a8d854':
  Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64).
2014-01-25 01:35:03 +00:00
Elliott Hughes
f3ea791757 am 6f23ce36: Merge "Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64)."
* commit '6f23ce36ce580da3c1419856c71d7426dd64748d':
  Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64).
2014-01-24 17:30:03 -08:00
Elliott Hughes
6f23ce36ce Merge "Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64)." 2014-01-25 01:25:16 +00:00
Ying Wang
cd66256a1f am 22750476: am b32cc032: Merge "Use arch-specific variable to set up the x86 ld flags."
* commit '227504768413a7802efcea3c80ee8fb6d78af9c5':
  Use arch-specific variable to set up the x86 ld flags.
2014-01-25 01:00:25 +00:00
Ying Wang
2275047684 am b32cc032: Merge "Use arch-specific variable to set up the x86 ld flags."
* commit 'b32cc032030e7a9f50b28d6dba5a40a38e6e76cf':
  Use arch-specific variable to set up the x86 ld flags.
2014-01-24 16:55:33 -08:00
Ying Wang
b32cc03203 Merge "Use arch-specific variable to set up the x86 ld flags." 2014-01-25 00:50:54 +00:00
Ying Wang
1682c63d77 Use arch-specific variable to set up the x86 ld flags.
Bug: 11654773
Change-Id: I9e9075bac1303cfa39b0f717dd74625ce1dd5fa5
2014-01-24 16:50:16 -08:00
Elliott Hughes
e2a292d278 Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64).
The various committees decided that everyone should get all these macros,
all the time.

Bug: 12708004
Change-Id: Ib56010dcba9b0656e5701546fefb7f78dc0bf916
2014-01-24 16:38:07 -08:00
Ben Cheng
0bae4c4d41 am 50228472: am 5acce960: Merge "Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c."
* commit '502284727b0e856442c95713ba61a16e7d86a5c1':
  Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c.
2014-01-25 00:24:08 +00:00
Ben Cheng
502284727b am 5acce960: Merge "Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c."
* commit '5acce960f40f51107301398f9cadff680a634951':
  Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c.
2014-01-24 16:19:39 -08:00
Ben Cheng
5acce960f4 Merge "Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c." 2014-01-25 00:13:10 +00:00
Ben Cheng
62ffe14a7e Add all implicitly loaded symbols from libgcc.a into libgcc_compat.c.
Change-Id: I0e66a73e849a01817d016a688d7291c2fb604e48
2014-01-24 15:20:11 -08:00
Colin Cross
3aa1e605ea am 35377004: am 513f83bb: Merge "bionic: rename aarch64 target to arm64"
* commit '353770042f38b0d377425f036979f7b90ac7429d':
  bionic: rename aarch64 target to arm64
2014-01-24 20:44:29 +00:00
Colin Cross
353770042f am 513f83bb: Merge "bionic: rename aarch64 target to arm64"
* commit '513f83bb7f6961d60eb10d2ab14fb31fed190bce':
  bionic: rename aarch64 target to arm64
2014-01-24 12:38:53 -08:00
Colin Cross
513f83bb7f Merge "bionic: rename aarch64 target to arm64" 2014-01-24 20:33:23 +00:00