Calin Juravle
9899217adb
am 9712d913: am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit '9712d913eba352d108116595d9be8bd0c96f24f6':
2014-07-12 02:06:31 +00:00
Calin Juravle
b89ef57d09
am cd061f6e: am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit 'cd061f6e434a28e979346b14cfe29a953ab9181f':
2014-07-12 02:06:30 +00:00
Christopher Ferris
a35ae1bcaa
am 4306b0f8: am 25fba981: Merge "Do not include libc_common in malloc debug code."
...
* commit '4306b0f82b236acb10e1f42e7d850e4edd37fb78':
2014-07-12 02:06:29 +00:00
Elliott Hughes
4c28373da6
am 96d7251c: am d028b620: Merge "Added a __system_property_serial benchmark."
...
* commit '96d7251cfc4d8134b864110908327880aa9ff8fd':
2014-07-12 02:06:29 +00:00
Elliott Hughes
4f459ec6bd
am 1cad0226: am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
...
* commit '1cad0226f5b0b7346516132bb45f09dafdffb91f':
2014-07-12 02:06:28 +00:00
Dan Albert
d0a7157c97
am ea04b5a6: am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
...
* commit 'ea04b5a6d9fbbc3877446f47a50b3070da1e036e':
2014-07-12 02:06:27 +00:00
Dan Albert
1e46158e64
am f6b95993: am 430d5f93: Merge "Add locale aware APIs."
...
* commit 'f6b95993486005afb1d53677b321a85870c3b0c3':
2014-07-12 02:06:27 +00:00
Elliott Hughes
67ee7b9d98
am 94560b5b: am 4c199170: Merge "Added __system_propery_read benchmark."
...
* commit '94560b5b9f43e106cce86916d99b86dd5e58d07b':
2014-07-12 02:06:26 +00:00
Elliott Hughes
c346c606e9
am 8d11fb18: am 3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
...
* commit '8d11fb187dd7aca49e89c6e90aa2e79afa68780d':
2014-07-12 02:06:25 +00:00
Elliott Hughes
536410018a
am 986fb565: am c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
...
* commit '986fb5657919bde859b4dc618169c3178bc86b3b':
2014-07-12 02:06:25 +00:00
Ying Wang
4fae767510
am 6ee2f321: am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
...
* commit '6ee2f321d46b807e7a1ba4e08f2174265de3ea66':
2014-07-12 02:06:24 +00:00
Dmitriy Ivanov
e245060c6d
am ab164750: am 3c12ae56: Merge "Add test for constructor function."
...
* commit 'ab16475066c4b2792601bfd41a2a7107c5a98b24':
2014-07-12 02:06:23 +00:00
Calin Juravle
9712d913eb
am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit '02459d34c9b82741155fbbb32850a7987eb7abaf':
Move __cmsg_nxthdr to its proper file.
2014-07-12 01:41:48 +00:00
Calin Juravle
cd061f6e43
am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit '8a71a745cb2a1eb573c6dc41e30c2f94a3a99db7':
Removed obsolete symbol cmsg_nxthdr.
2014-07-12 01:41:48 +00:00
Christopher Ferris
4306b0f82b
am 25fba981: Merge "Do not include libc_common in malloc debug code."
...
* commit '25fba981a17c51df6cf88d5ace7ffe3c5a5766e4':
Do not include libc_common in malloc debug code.
2014-07-12 01:41:47 +00:00
Elliott Hughes
96d7251cfc
am d028b620: Merge "Added a __system_property_serial benchmark."
...
* commit 'd028b6209cde7929e6d0613cbd92cc7b766d3d09':
Added a __system_property_serial benchmark.
2014-07-12 01:41:47 +00:00
Elliott Hughes
1cad0226f5
am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
...
* commit '84f0c7c258b3a72eed8737662bb5a730d6d9f5e2':
update-tzdata.py needs to know where to find icu.
2014-07-12 01:41:47 +00:00
Dan Albert
ea04b5a6d9
am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
...
* commit '7a85d9a1de7f0970af19eca5f3ca6938cbc2ce95':
Revert "Add locale aware APIs."
2014-07-12 01:41:47 +00:00
Dan Albert
f6b9599348
am 430d5f93: Merge "Add locale aware APIs."
...
* commit '430d5f93ceea2e5172144a05885c295dca51b876':
Add locale aware APIs.
2014-07-12 01:41:46 +00:00
Elliott Hughes
94560b5b9f
am 4c199170: Merge "Added __system_propery_read benchmark."
...
* commit '4c199170a84e725a56b7d40c113c9d76a75d89ab':
Added __system_propery_read benchmark.
2014-07-12 01:41:46 +00:00
Elliott Hughes
8d11fb187d
am 3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
...
* commit '3139f6fdd7f9bec3b53be3da62314ae8ba24ceb4':
Remove __CTOR_LIST__ from mips/mips64.
2014-07-12 01:41:46 +00:00
Elliott Hughes
986fb56579
am c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
...
* commit 'c4c6789362b82150e3f16cd655032f7ab2a1b6d6':
Don't zero r1 on entry to the dynamic linker.
2014-07-12 01:41:46 +00:00
Ying Wang
6ee2f321d4
am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
...
* commit '6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666':
TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target
2014-07-12 01:41:46 +00:00
Dmitriy Ivanov
ab16475066
am 3c12ae56: Merge "Add test for constructor function."
...
* commit '3c12ae56f402744d1a446ceef7d20f5ea01025c3':
Add test for constructor function.
2014-07-12 01:41:45 +00:00
Dmitriy Ivanov
30e596e9ea
am ca673e73: am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit 'ca673e7300b361bbf49c2b7ea1012441d62b1995':
2014-07-11 17:52:23 +00:00
Elliott Hughes
a3eead96b9
am 7e43f0d4: resolved conflicts for merge of aedc14b1 to lmp-dev
...
* commit '7e43f0d40d3189ca219c6758f61ffe2a2d411ee2':
2014-07-11 17:52:22 +00:00
Dmitriy Ivanov
ca673e7300
am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit 'b9c5d606aab6c1a21e3785d155613c35c276eb18':
Change android_dlextinfo flags to uint64_t
2014-07-11 17:28:53 +00:00
Elliott Hughes
7e43f0d40d
resolved conflicts for merge of aedc14b1 to lmp-dev
...
Change-Id: I36d3a6ca42778686f1f2971ae72cd3b7b156a3da
2014-07-11 10:03:35 -07:00
Calin Juravle
3b0f3112d0
am f11e7c74: am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit 'f11e7c74b5c8845bbad75c53f2837b831d883ea6':
Move __cmsg_nxthdr to its proper file.
2014-07-10 15:24:13 +00:00
Calin Juravle
f11e7c74b5
am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit '02459d34c9b82741155fbbb32850a7987eb7abaf':
Move __cmsg_nxthdr to its proper file.
2014-07-10 15:20:25 +00:00
Calin Juravle
e8ce76c26e
am 1d63dd90: am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit '1d63dd9092cc44645ab5001ea79f9f0aba86df69':
Removed obsolete symbol cmsg_nxthdr.
2014-07-10 11:57:29 +00:00
Calin Juravle
1d63dd9092
am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit '8a71a745cb2a1eb573c6dc41e30c2f94a3a99db7':
Removed obsolete symbol cmsg_nxthdr.
2014-07-10 11:54:36 +00:00
Christopher Ferris
0f8d5a0664
am c04e73a6: am 25fba981: Merge "Do not include libc_common in malloc debug code."
...
* commit 'c04e73a6b808012403a53d847f4946b33e880018':
Do not include libc_common in malloc debug code.
2014-07-10 11:01:11 +00:00
Christopher Ferris
c04e73a6b8
am 25fba981: Merge "Do not include libc_common in malloc debug code."
...
* commit '25fba981a17c51df6cf88d5ace7ffe3c5a5766e4':
Do not include libc_common in malloc debug code.
2014-07-10 09:43:32 +00:00
Elliott Hughes
05916dda8a
am cf53885b: am d028b620: Merge "Added a __system_property_serial benchmark."
...
* commit 'cf53885bfac9c7391d779df0a16355645fdedf64':
Added a __system_property_serial benchmark.
2014-07-10 00:24:33 +00:00
Elliott Hughes
42775b512f
am feccec68: am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
...
* commit 'feccec68c57f03647166317b7f528364f925bbab':
update-tzdata.py needs to know where to find icu.
2014-07-10 00:24:32 +00:00
Dan Albert
293006c91b
am 418fdef2: am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
...
* commit '418fdef2e7299fbf3d7c06319711b84a58423c2a':
Revert "Add locale aware APIs."
2014-07-10 00:24:32 +00:00
Dan Albert
16dd7fd5d2
am 43e79dab: am 430d5f93: Merge "Add locale aware APIs."
...
* commit '43e79dab8478fcfadd723a9ba51b7cb07a214f79':
Add locale aware APIs.
2014-07-10 00:24:27 +00:00
Elliott Hughes
cf53885bfa
am d028b620: Merge "Added a __system_property_serial benchmark."
...
* commit 'd028b6209cde7929e6d0613cbd92cc7b766d3d09':
Added a __system_property_serial benchmark.
2014-07-10 00:16:26 +00:00
Elliott Hughes
feccec68c5
am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
...
* commit '84f0c7c258b3a72eed8737662bb5a730d6d9f5e2':
update-tzdata.py needs to know where to find icu.
2014-07-10 00:16:25 +00:00
Dan Albert
418fdef2e7
am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
...
* commit '7a85d9a1de7f0970af19eca5f3ca6938cbc2ce95':
Revert "Add locale aware APIs."
2014-07-10 00:16:24 +00:00
Dan Albert
43e79dab84
am 430d5f93: Merge "Add locale aware APIs."
...
* commit '430d5f93ceea2e5172144a05885c295dca51b876':
Add locale aware APIs.
2014-07-10 00:16:23 +00:00
Christopher Ferris
25fba981a1
Merge "Do not include libc_common in malloc debug code."
2014-07-09 22:27:32 +00:00
Christopher Ferris
dda1c6c466
Do not include libc_common in malloc debug code.
...
The inclusion of the static libc_common library in the malloc_debug_XXX.so
shared libraries causes constructors to be called twice. This doesn't seem
to have caused any issues when setting the libc.debug.malloc property.
However, jemalloc crashes because there are two jemalloc implementations,
one in the static libc_common library and one in the shared library. Each
implementation has created overlapping thread keys that are not the same.
The crash comes because one of the jemalloc keys is actually used by the
locale setting code. Thus if someone sets the locale, the jemalloc code
crashes trying to access the same key.
Change-Id: Iaac650a82d69064db148a6333e9403744f68b4a4
2014-07-09 21:27:15 -07:00
Elliott Hughes
84f0c7c258
Merge "update-tzdata.py needs to know where to find icu."
2014-07-09 22:27:32 +00:00
Elliott Hughes
30ab939496
update-tzdata.py needs to know where to find icu.
...
Change-Id: If5561b92c233276fb072da62be21f23df4781c41
2014-07-09 15:42:59 -07:00
Dan Albert
430d5f93ce
Merge "Add locale aware APIs."
2014-07-09 22:27:32 +00:00
Dan Albert
e087eac404
Add locale aware APIs.
...
Since we only support the C locale, we can just forward all of these to
their non-locale equivalents for correct behavior.
Change-Id: Ib7be71b7f636309c0cc3be1096a4c1f693f04fbb
2014-07-09 15:41:53 -07:00
Calin Juravle
02459d34c9
Merge "Move __cmsg_nxthdr to its proper file."
2014-07-09 19:42:15 +00:00
Calin Juravle
f8408c58fa
Move __cmsg_nxthdr to its proper file.
...
Change-Id: I095fb6bc5318f2d256baa97658bdfe679d235aec
2014-07-10 12:47:13 +01:00