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
8a71a745cb
Merge "Removed obsolete symbol cmsg_nxthdr."
2014-07-09 19:42:15 +00:00
Calin Juravle
e95d0fc34c
Removed obsolete symbol cmsg_nxthdr.
...
Bug: 15822452
Change-Id: I5322fb29522fc58e9c3489ff86216e25a12ef970
2014-07-10 12:44:52 +01:00
Elliott Hughes
e2bcc8bbe5
am 748d8708
: am 4c199170
: Merge "Added __system_propery_read benchmark."
...
* commit '748d870871b8b95ae054f733683658afba86a539':
Added __system_propery_read benchmark.
2014-07-09 18:15:10 +00:00
Elliott Hughes
748d870871
am 4c199170
: Merge "Added __system_propery_read benchmark."
...
* commit '4c199170a84e725a56b7d40c113c9d76a75d89ab':
Added __system_propery_read benchmark.
2014-07-09 18:11:32 +00:00
Elliott Hughes
48ad92a4b1
am 742fce7b
: am 3139f6fd
: Merge "Remove __CTOR_LIST__ from mips/mips64."
...
* commit '742fce7b8414c095dd895547564ea8ef55d526b0':
Remove __CTOR_LIST__ from mips/mips64.
2014-07-09 16:58:06 +00:00
Elliott Hughes
742fce7b84
am 3139f6fd
: Merge "Remove __CTOR_LIST__ from mips/mips64."
...
* commit '3139f6fdd7f9bec3b53be3da62314ae8ba24ceb4':
Remove __CTOR_LIST__ from mips/mips64.
2014-07-09 16:53:38 +00:00
Elliott Hughes
dc0b68e5ee
am b9d95b5d
: am c4c67893
: Merge "Don\'t zero r1 on entry to the dynamic linker."
...
* commit 'b9d95b5d2f6eb748c0fdb83087b96bdb1cb5ef24':
Don't zero r1 on entry to the dynamic linker.
2014-07-09 16:36:24 +00:00
Elliott Hughes
b9d95b5d2f
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-09 16:32:58 +00:00
Ying Wang
76171b2d58
am 02406f68
: am 6cdd0cfd
: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
...
* commit '02406f688ce2b9d35573a483251628bc82e88b3f':
TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target
2014-07-09 16:26:28 +00:00
Ying Wang
02406f688c
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-09 16:22:58 +00:00
Dmitriy Ivanov
4e37e7b1e8
am b9247ada
: am 3c12ae56
: Merge "Add test for constructor function."
...
* commit 'b9247ada209fd7e3570127aacd77542d41a111fc':
Add test for constructor function.
2014-07-09 15:07:37 +00:00
Elliott Hughes
4c199170a8
Merge "Added __system_propery_read benchmark."
2014-07-09 14:50:30 +00:00
Brigid Smith
a304476145
Added __system_propery_read benchmark.
...
Change-Id: Ic0e9118859a013aa04841de25822a81a7fc74b3c
2014-07-09 10:26:17 -07:00
Ying Wang
6cdd0cfd2f
Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target"
2014-07-09 14:50:30 +00:00
Dan Albert
7a85d9a1de
Merge "Revert "Add locale aware APIs.""
2014-07-09 14:45:53 +00:00
Dan Albert
063e20c269
Revert "Add locale aware APIs."
...
Accidentally verified against a dirty tree. Needs the companion change to libc++ to land upstream before I can submit this.
This reverts commit e087eac404
.
Change-Id: I317ecd0923114f415eaad7603002f77feffb5e3f
2014-07-09 22:50:43 +00:00
Elliott Hughes
d028b6209c
Merge "Added a __system_property_serial benchmark."
2014-07-09 14:42:04 +00:00
Brigid Smith
28417e6314
Added a __system_property_serial benchmark.
...
Change-Id: Ifc2116f26acb242f4dcdb6eefe128899a9dc63bb
2014-07-09 15:48:37 -07:00
Elliott Hughes
3139f6fdd7
Merge "Remove __CTOR_LIST__ from mips/mips64."
2014-07-09 14:42:04 +00:00
Elliott Hughes
40ad229b25
Remove __CTOR_LIST__ from mips/mips64.
...
Change-Id: I3486b09e30b32ddb67da602cbc2b5fb0402f9764
2014-07-09 09:20:17 -07:00
Elliott Hughes
c4c6789362
Merge "Don't zero r1 on entry to the dynamic linker."
2014-07-09 14:42:04 +00:00
Dmitriy Ivanov
b9247ada20
am 3c12ae56
: Merge "Add test for constructor function."
...
* commit '3c12ae56f402744d1a446ceef7d20f5ea01025c3':
Add test for constructor function.
2014-07-09 12:36:58 +00:00
Elliott Hughes
996524383f
Don't zero r1 on entry to the dynamic linker.
...
There's no need: __linker_init only takes one argument.
Also remove the arm __CTOR_LIST__; we use .init_array and .fini_array instead
of .ctor and .dtor anyway, and I don't think we've ever supported the latter.
Change-Id: Ifc91a5a90c6aa39d674bf0509a7af2e1ff0beddd
2014-07-08 21:38:32 -07:00
Ying Wang
dc42e20d54
TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target
...
Change-Id: I9a562e79de7ec0f065c90de9ae1b72cbcd7d8c6b
2014-07-08 18:54:42 -07:00
Dmitriy Ivanov
3c12ae56f4
Merge "Add test for constructor function."
2014-07-08 22:56:31 +00:00
Dmitriy Ivanov
f8846a4587
Add test for constructor function.
...
Change-Id: I0ad26d617f00cdd6c2241d613be39a1d16918612
2014-07-08 21:21:34 -07:00
Dmitriy Ivanov
4c63233511
am b9c5d606
: am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit 'b9c5d606aab6c1a21e3785d155613c35c276eb18':
Change android_dlextinfo flags to uint64_t
2014-07-08 18:35:19 +00:00
Dmitriy Ivanov
b9c5d606aa
am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit '006e0770ffaa57d88f407fad8d9b78ea0efa9c6a':
Change android_dlextinfo flags to uint64_t
2014-07-08 18:33:20 +00:00
Elliott Hughes
ddf9066e2e
resolved conflicts for merge of aedc14b1
to master
...
Change-Id: Ib00a09a01541afb010f3c8a6f125d067a0c7812d
2014-07-08 11:15:27 -07:00
Elliott Hughes
aedc14b166
am 7244a861
: Merge "Regenerate the bionic NOTICE files."
...
* commit '7244a8610a1b6f7cb38336696e15e2e4ee04613c':
Regenerate the bionic NOTICE files.
2014-07-08 17:50:07 +00:00
Elliott Hughes
7244a8610a
Merge "Regenerate the bionic NOTICE files."
2014-07-08 02:15:13 +00:00
Elliott Hughes
1558138315
Regenerate the bionic NOTICE files.
...
Also fix a few formatting issues in copyright headers that were confusing
the script (though obviously it would be better if the script were smarter).
Change-Id: I7f561bef4f84fdcbd84f375ee226bd65db0e507b
2014-07-07 15:42:06 -07:00