Commit Graph

9981 Commits

Author SHA1 Message Date
Ying Wang
b1be9d8b5c am af47a46d: am 4fae7675: am 6ee2f321: am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit 'af47a46d38d3b5571944e70ed9ea0a0816dd4685':
2014-07-14 19:29:22 +00:00
Dmitriy Ivanov
be0162e1d7 am 3dd6e3d8: am e245060c: am ab164750: am 3c12ae56: Merge "Add test for constructor function."
* commit '3dd6e3d880077ee2632fb055ef17339558a61c03':
2014-07-14 19:29:21 +00:00
Dmitriy Ivanov
9afe125fdb am 065abed9: am 30e596e9: am ca673e73: am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '065abed9a580e8ad23bd6cbd5721ea1d70474828':
2014-07-14 19:29:20 +00:00
Elliott Hughes
21c8f41d3f am 0ec257dc: am a3eead96: am 7e43f0d4: resolved conflicts for merge of aedc14b1 to lmp-dev
* commit '0ec257dc20ceadde049296246c78b99f02625412':
2014-07-14 19:29:18 +00:00
Calin Juravle
48766828da am 37eca3d3: am 3b0f3112: am f11e7c74: am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
* commit '37eca3d325de93ce95e0f85c53aab508c18b306d':
2014-07-14 19:29:17 +00:00
Calin Juravle
a7be72e7a2 am b94d0294: am e8ce76c2: am 1d63dd90: am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
* commit 'b94d0294037a37b60ba2bd403f12c1c7c28efbaa':
2014-07-14 19:29:16 +00:00
Christopher Ferris
450f9a4b83 am c743b189: am 0f8d5a06: am c04e73a6: am 25fba981: Merge "Do not include libc_common in malloc debug code."
* commit 'c743b18961b46b82e5a4770d67071aeeee8753bf':
2014-07-14 19:29:15 +00:00
Elliott Hughes
6bf66f8ce7 am 5252514d: am 05916dda: am cf53885b: am d028b620: Merge "Added a __system_property_serial benchmark."
* commit '5252514d65ee924d53ceafd14e0d566a477cf35a':
2014-07-14 19:29:14 +00:00
Elliott Hughes
04b7898f17 am e4a1004d: am 42775b51: am feccec68: am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
* commit 'e4a1004d875465b39e7d557bdcc5bbfa8acefeda':
2014-07-14 19:29:13 +00:00
Dan Albert
b24b709ea2 am 5b41373d: am 293006c9: am 418fdef2: am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
* commit '5b41373d499b7ab2b72ad5235c5d1a3c06f236b2':
2014-07-14 19:29:11 +00:00
Dan Albert
79465f3d25 am a0ce997e: am 16dd7fd5: am 43e79dab: am 430d5f93: Merge "Add locale aware APIs."
* commit 'a0ce997e1bf7a1074ce78b1ff8cf6acfa59ca2f3':
2014-07-14 19:29:10 +00:00
Elliott Hughes
3cdcfc82eb am 6c804ab1: am e2bcc8bb: am 748d8708: am 4c199170: Merge "Added __system_propery_read benchmark."
* commit '6c804ab1ea8ed48ba9ec78c443f2c7815fa830a0':
2014-07-14 19:29:09 +00:00
Elliott Hughes
129820c8d6 am 7ad8adbe: am 48ad92a4: am 742fce7b: am 3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
* commit '7ad8adbe51280128ddcad7849f36d091fb05dda1':
2014-07-14 19:29:08 +00:00
Elliott Hughes
845d50ba81 am f7fe0779: am dc0b68e5: am b9d95b5d: am c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
* commit 'f7fe0779027ce54b6936f8210bc867707c969f38':
2014-07-14 19:29:06 +00:00
Ying Wang
8e8d019b5c am de78c2c4: am 76171b2d: am 02406f68: am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit 'de78c2c45181e8a1b16e70c87be981af9c76a092':
2014-07-14 19:29:05 +00:00
Dmitriy Ivanov
fd2fd4398e am 994faff2: am 4e37e7b1: am b9247ada: am 3c12ae56: Merge "Add test for constructor function."
* commit '994faff20941661a557e3a9339768fa8e2ecf21d':
2014-07-14 19:29:04 +00:00
Dmitriy Ivanov
ff181ce7ac am 49b59013: am 4c632335: am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '49b590136a7269902179bf61258709d2bb6d5611':
2014-07-14 19:29:03 +00:00
Elliott Hughes
d7c9ad906b am f40424d3: am ddf9066e: resolved conflicts for merge of aedc14b1 to master
* commit 'f40424d38fbe540c1a04a27f7ad1c7a89826fd1c':
2014-07-14 19:29:02 +00:00
Ying Wang
af47a46d38 am 4fae7675: am 6ee2f321: am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit '4fae7675103463a8322a04da707ba1f2d90ca9bb':
2014-07-14 19:09:50 +00:00
Dmitriy Ivanov
3dd6e3d880 am e245060c: am ab164750: am 3c12ae56: Merge "Add test for constructor function."
* commit 'e245060c6d1d0ed4a45909b50fe6bd04de068aa3':
2014-07-14 19:09:50 +00:00
Dmitriy Ivanov
065abed9a5 am 30e596e9: am ca673e73: am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '30e596e9ead5bd7cfd9599b0e3d5e8bd4f6c1353':
2014-07-14 19:09:49 +00:00
Elliott Hughes
0ec257dc20 am a3eead96: am 7e43f0d4: resolved conflicts for merge of aedc14b1 to lmp-dev
* commit 'a3eead96b9f1000d403541dad0f086c3b175900a':
2014-07-14 19:09:48 +00:00
Calin Juravle
37eca3d325 am 3b0f3112: am f11e7c74: am 02459d34: Merge "Move __cmsg_nxthdr to its proper file."
* commit '3b0f3112d0fed5cf30e2ad3fc6500810b760b35d':
2014-07-14 19:09:48 +00:00
Calin Juravle
b94d029403 am e8ce76c2: am 1d63dd90: am 8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
* commit 'e8ce76c26e0bae90b50ece7f8fa3d3f2fefc2476':
2014-07-14 19:09:47 +00:00
Christopher Ferris
c743b18961 am 0f8d5a06: am c04e73a6: am 25fba981: Merge "Do not include libc_common in malloc debug code."
* commit '0f8d5a0664f6b21e4ebde63aa76ee2518bae9114':
2014-07-14 19:09:46 +00:00
Elliott Hughes
5252514d65 am 05916dda: am cf53885b: am d028b620: Merge "Added a __system_property_serial benchmark."
* commit '05916dda8a9a48ce491ea33b9d196741125fe957':
2014-07-14 19:09:45 +00:00
Elliott Hughes
e4a1004d87 am 42775b51: am feccec68: am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
* commit '42775b512fa6f39a93c130513f1c44cebfdb9c8c':
2014-07-14 19:09:45 +00:00
Dan Albert
5b41373d49 am 293006c9: am 418fdef2: am 7a85d9a1: Merge "Revert "Add locale aware APIs.""
* commit '293006c91b22105419e446268dee3b9b6d6e7dac':
2014-07-14 19:09:44 +00:00
Dan Albert
a0ce997e1b am 16dd7fd5: am 43e79dab: am 430d5f93: Merge "Add locale aware APIs."
* commit '16dd7fd5d293ad1fa5d812743cbbbddad20055ae':
2014-07-14 19:09:43 +00:00
Elliott Hughes
6c804ab1ea am e2bcc8bb: am 748d8708: am 4c199170: Merge "Added __system_propery_read benchmark."
* commit 'e2bcc8bbe5b426e627395e88bb1748a3f33ccd98':
2014-07-14 19:09:43 +00:00
Elliott Hughes
7ad8adbe51 am 48ad92a4: am 742fce7b: am 3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
* commit '48ad92a4b1e3d7a3611eba3bc067989a138802b4':
2014-07-14 19:09:42 +00:00
Elliott Hughes
f7fe077902 am dc0b68e5: am b9d95b5d: am c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
* commit 'dc0b68e5ee7f730adf2864c9c16a38b7ab8c8432':
2014-07-14 19:09:42 +00:00
Ying Wang
de78c2c451 am 76171b2d: am 02406f68: am 6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit '76171b2d583ee21c1292f402f109e800120f9907':
2014-07-14 19:09:41 +00:00
Dmitriy Ivanov
994faff209 am 4e37e7b1: am b9247ada: am 3c12ae56: Merge "Add test for constructor function."
* commit '4e37e7b1e89c3c9f734a3593838b6ba9b0e0e855':
2014-07-14 19:09:40 +00:00
Dmitriy Ivanov
49b590136a am 4c632335: am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '4c632335112a9cedee8bb09be7ca56b132ef21ee':
2014-07-14 19:09:40 +00:00
Elliott Hughes
f40424d38f am ddf9066e: resolved conflicts for merge of aedc14b1 to master
* commit 'ddf9066e2e850a1e0dc936a731994ec831581807':
2014-07-14 19:09:39 +00:00
Elliott Hughes
3b318a5b3d am e2b177a5: am 83ce99d8: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."
* commit 'e2b177a5d1384ebbb82d576637364e5b24450beb':
  Define SIOCKILLADDR which isn't in the common kernel uapi headers.
2014-07-12 13:08:44 +00:00
Elliott Hughes
e2b177a5d1 am 83ce99d8: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."
* commit '83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c':
  Define SIOCKILLADDR which isn't in the common kernel uapi headers.
2014-07-12 12:59:27 +00:00
Elliott Hughes
f6968e3c08 Define SIOCKILLADDR which isn't in the common kernel uapi headers.
(cherry picked from commit 2ba2888cac)

Change-Id: I3845871bb44dae94d9a0428af0f562ddfb8bd660
2014-07-11 22:37:13 -07:00
Elliott Hughes
bae7c20672 am b962ab81: am 57a5b338: Merge "Define three prctl constants that went missing from uapi."
* commit 'b962ab81fc37fc8b4b8cfd45d3538b641dd6fd13':
  Define three prctl constants that went missing from uapi.
2014-07-12 03:15:29 +00:00
Elliott Hughes
b962ab81fc am 57a5b338: Merge "Define three prctl constants that went missing from uapi."
* commit '57a5b3380a8834ecb4a32d01433a3127454443d7':
  Define three prctl constants that went missing from uapi.
2014-07-12 03:10:36 +00:00
Elliott Hughes
f65d552b3d am 0594b9dd: am b8e82b5e: Merge "EM_ARM and EM_AARCH64 are now in the uapi header."
* commit '0594b9ddded7d832b786c209dd7cd4e26ee32eb8':
  EM_ARM and EM_AARCH64 are now in the uapi header.
2014-07-12 02:06:38 +00:00
Christopher Ferris
8832cfb2fe am efdf7862: am 385bb1ed: Merge "Add optimized memchr implementation from newlib"
* commit 'efdf7862be41b2dfd8d013e2495af9a2db5286f5':
  Add optimized memchr implementation from newlib
2014-07-12 02:06:37 +00:00
Christopher Ferris
d92a6d0669 am 55230dd0: am 96502e27: Merge "Make jemalloc the default choice."
* commit '55230dd048d8c93af67611c30fd6563e24ef23c5':
  Make jemalloc the default choice.
2014-07-12 02:06:37 +00:00
Christopher Ferris
d389809de7 am 18a25078: am c6bc0017: Merge "Update kernel headers to v3.14."
* commit '18a25078f0cc0aa9842f6397e3c24a5ae8686de5':
  Update kernel headers to v3.14.
2014-07-12 02:06:36 +00:00
Elliott Hughes
9c98443e2b am ce1422b9: am 040e1187: Merge "Enable building libc with clang."
* commit 'ce1422b985383c4cbb485b3ec121eb8d01af12b8':
  Enable building libc with clang.
2014-07-12 02:06:36 +00:00
Dan Albert
405fd491bc am c0afc23e: am 37f09d6d: Merge "Revert "Revert "Add locale aware APIs."""
* commit 'c0afc23e26ca0a591dd8fb5fcddf1cb616bd5e43':
  Revert "Revert "Add locale aware APIs.""
2014-07-12 02:06:35 +00:00
Elliott Hughes
210a842354 am d19f2d85: am 76df69d1: Merge "The err family allow null format strings."
* commit 'd19f2d859f744ded5a70cf0d8a23427eac7ec817':
  The err family allow null format strings.
2014-07-12 02:06:35 +00:00
Elliott Hughes
d54994a45f am 696c48df: am eba7c15b: Merge "Revert "Switch libm to building with clang.""
* commit '696c48df69a0841e8e179e313302c01155df5e85':
  Revert "Switch libm to building with clang."
2014-07-12 02:06:34 +00:00
Elliott Hughes
2545bf7b41 am 37ab54fd: am 5df23dc8: Merge "Switch libm to building with clang."
* commit '37ab54fd88f2bc579f7d5b931d6e3c40ad4e1f05':
  Switch libm to building with clang.
2014-07-12 02:06:33 +00:00