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
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
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
Elliott Hughes
e20bbaf8bb
am 4568e344
: am 2b2916d1
: Merge "Remove some dead data."
...
* commit '4568e344c0a7581dc1b32387ba18c99df76ffeea':
Remove some dead data.
2014-07-07 18:08:48 +00:00
Elliott Hughes
88ed7d2cc1
am d5a6a5e1
: am db42a9f5
: Merge "Fix three clang complaints about the DNS code."
...
* commit 'd5a6a5e18d66543bdfa4dffdfeec80eff32a87b9':
Fix three clang complaints about the DNS code.
2014-07-07 18:08:47 +00:00
Elliott Hughes
4324fd7916
am a19e1d1c
: am 4d763df3
: Merge "Fix a broken boolean test found by clang."
...
* commit 'a19e1d1c6519e6adaa37ae151dc87cb04fe998b0':
Fix a broken boolean test found by clang.
2014-07-07 18:08:46 +00:00
Elliott Hughes
ea24c25512
am 13610bec
: am 1ee1bfde
: Merge "Use __unused rather than self assignment for unused parameters."
...
* commit '13610bec6bfc0af64efdeeafc4c25d34912c2856':
Use __unused rather than self assignment for unused parameters.
2014-07-07 18:08:46 +00:00
Elliott Hughes
4568e344c0
am 2b2916d1
: Merge "Remove some dead data."
...
* commit '2b2916d15458671babed9e250b4d98f1980a976d':
Remove some dead data.
2014-07-07 18:02:34 +00:00
Elliott Hughes
d5a6a5e18d
am db42a9f5
: Merge "Fix three clang complaints about the DNS code."
...
* commit 'db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b':
Fix three clang complaints about the DNS code.
2014-07-07 18:02:33 +00:00
Elliott Hughes
a19e1d1c65
am 4d763df3
: Merge "Fix a broken boolean test found by clang."
...
* commit '4d763df3243f81041269015d0ac3fbd2912d5f3d':
Fix a broken boolean test found by clang.
2014-07-07 18:02:33 +00:00
Elliott Hughes
13610bec6b
am 1ee1bfde
: Merge "Use __unused rather than self assignment for unused parameters."
...
* commit '1ee1bfdeeca74d71f3e7de7ac3a7e45c9a7d0f53':
Use __unused rather than self assignment for unused parameters.
2014-07-07 18:02:32 +00:00