Commit Graph

2536 Commits

Author SHA1 Message Date
Joe Onorato
cefb93b632 am 6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '6c98cdb1924afd3e71d39904557933fa10adaebf':
  Don't over-generalize makefiles.  Host modules always build. This isn't needed on eng builds.
2012-08-16 23:50:35 -07:00
Joe Onorato
6c98cdb192 Merge "Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds." 2012-08-16 23:37:50 -07:00
Joe Onorato
7b841f3b4a Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Change-Id: I5821ced7a8a9042fd2094204e07470d8002263ca
2012-08-16 22:36:36 -07:00
Elliott Hughes
a7d8f3d50e am c80ca54f: am 60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit 'c80ca54f3cd2d7e20770e286f4478fb589742478':
  Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:05:40 -07:00
Elliott Hughes
c80ca54f3c am 60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '60ef95e1c1b171635adb4d11289347674b1b8987':
  Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:04:11 -07:00
Elliott Hughes
60ef95e1c1 Merge "Enhance getcwd(3) to handle NULL like glibc." 2012-08-16 16:58:34 -07:00
Elliott Hughes
04a83a48ed Enhance getcwd(3) to handle NULL like glibc.
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
2012-08-16 15:59:12 -07:00
Elliott Hughes
820ad4283d am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
  bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:23:56 -07:00
Elliott Hughes
74438bb225 am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '449d4634bea0ff8f6b29a2826871279dd654f941':
  bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 12:27:47 -07:00
Elliott Hughes
449d4634be Merge "bionic: add macro protection for MALLOC_ALIGNMENT" 2012-08-16 12:09:13 -07:00
Jin Wei
9862f5e08b bionic: add macro protection for MALLOC_ALIGNMENT
In previous commit: 2fd81ef7, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.

Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-08-16 12:08:36 -07:00
Scott Anderson
09d9dd3acd Merge "Add clean kernel header for uhid." into jb-mr1-dev 2012-08-16 12:03:25 -07:00
Scott Anderson
52bf2d5659 Add clean kernel header for uhid.
The original kernel header was submitted in this change:

  commit 45b515c106161bb3b00d2c097504b9d44505f2d9
  Author: Scott Anderson <saa@android.com>
  Date:   Wed Aug 15 14:52:27 2012 -0700

      Add uhid original header.

      This header was cherry-picked from the upstream series that ends
      with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.

      Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
      Signed-off-by: Scott Anderson <saa@android.com>

Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-16 11:56:11 -07:00
The Android Automerger
e20afb140c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:33:16 -07:00
Elliott Hughes
a626bbdb36 am 4af9141c: am ae728099: Merge "enable clone system call for x86"
* commit '4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
  enable clone system call for x86
2012-08-15 17:24:21 -07:00
Elliott Hughes
4af9141c5c am ae728099: Merge "enable clone system call for x86"
* commit 'ae7280994e7845037b667fd6ebdcb6f299ba1aab':
  enable clone system call for x86
2012-08-15 17:22:50 -07:00
Elliott Hughes
29af938cbd am ab8850f7: am 07cd1125: Merge "Fix comment typos."
* commit 'ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
  Fix comment typos.
2012-08-15 17:08:01 -07:00
Elliott Hughes
4d63f33cdc am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
* commit '76aad1d2746f62aaaacdf717b4f51fa45560521d':
  Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:07:59 -07:00
Elliott Hughes
ab8850f7e2 am 07cd1125: Merge "Fix comment typos."
* commit '07cd11251f52ff8a8a98dba795f69aaa75199473':
  Fix comment typos.
2012-08-15 17:06:53 -07:00
Elliott Hughes
76aad1d274 am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
* commit 'e1cd69a708d30fbc3b9e0e8d4db67f67fc123b65':
  Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:06:51 -07:00
Elliott Hughes
ae7280994e Merge "enable clone system call for x86" 2012-08-15 17:05:47 -07:00
Jin Wei
22d366cc09 enable clone system call for x86
Add __bionic_clone function for x86, which will be
used for clone system call.

Change-Id: I889dc9bf4b7ebb4358476e17e6f3233e26491f4d
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 51414
2012-08-15 17:04:50 -07:00
Elliott Hughes
07cd11251f Merge "Fix comment typos." 2012-08-15 16:59:21 -07:00
Elliott Hughes
105bc26fa6 Fix comment typos.
Change-Id: I8feeec1ee9935a6d6baebe57f1c0043ff90ff94f
2012-08-15 16:56:00 -07:00
Elliott Hughes
e1cd69a708 Merge "Regenerate all NOTICE files with the latest version of the script." 2012-08-15 16:51:56 -07:00
Elliott Hughes
2e3756b4d3 am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
  Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
Elliott Hughes
9b3bbcda84 am fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit 'fe43c768ec803a1febde0424bb5e69c343dd7ae9':
  Switch to the current NetBSD regex implementation.
2012-08-15 15:58:39 -07:00
Elliott Hughes
32dbc03c73 Regenerate all NOTICE files with the latest version of the script.
This sorts every entry, so we should have more stability and fewer
merge conflicts in future.

Change-Id: Ifc5347dc53352da22c82d41ca59b483966fcfc6b
2012-08-15 15:43:13 -07:00
Elliott Hughes
fe43c768ec Merge "Switch to the current NetBSD regex implementation." 2012-08-15 15:39:49 -07:00
Elliott Hughes
cc213f871b Switch to the current NetBSD regex implementation.
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
2012-08-15 15:39:11 -07:00
The Android Automerger
46bb2a222e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:33:26 -07:00
Elliott Hughes
8225911775 am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
  Sort NOTICE entries.
2012-08-14 15:43:57 -07:00
Elliott Hughes
008a0a5d50 am 53493a9b: Merge "Sort NOTICE entries."
* commit '53493a9b26e9fb665de590abf3502af94eaf3f44':
  Sort NOTICE entries.
2012-08-14 15:42:36 -07:00
Iliyan Malchev
df88d88f56 Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
* changes:
  update msm_mdp.h header to support vsync
  update processed msm_camera.h and msm_isp.h
2012-08-14 15:40:21 -07:00
Elliott Hughes
53493a9b26 Merge "Sort NOTICE entries." 2012-08-14 15:31:18 -07:00
Elliott Hughes
fdbecf3b5a am 63696738: am b6a97196: Merge "More cleanup."
* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
  More cleanup.
2012-08-14 15:10:51 -07:00
Elliott Hughes
63696738e5 am b6a97196: Merge "More cleanup."
* commit 'b6a971962acdf2684fd98658ec6fe6aa9952d84b':
  More cleanup.
2012-08-14 15:08:38 -07:00
Elliott Hughes
261e2232c1 Sort NOTICE entries.
Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.

Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592
2012-08-14 15:04:05 -07:00
Elliott Hughes
b6a971962a Merge "More cleanup." 2012-08-14 15:02:40 -07:00
Elliott Hughes
bedfe38b8b More cleanup.
Make more stuff static, remove some dead code, and fix a few typos.

Change-Id: I010b0eadeaf61e2899c37014ad1e7082c70bd510
2012-08-14 14:07:59 -07:00
Naseer Ahmed
056b4bc499 update msm_mdp.h header to support vsync
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
2012-08-14 12:51:42 -07:00
Ajay Dudani
77b25702ba update processed msm_camera.h and msm_isp.h
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
2012-08-14 12:51:42 -07:00
Elliott Hughes
89a3543568 am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
* commit '16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
  Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:29:01 -07:00
Elliott Hughes
16a0cbaa83 am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
* commit 'b7c6991c9af3882bd13cbf6bc42da85c884aa5f5':
  Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:27:44 -07:00
Elliott Hughes
b7c6991c9a Merge "Update MS_ mount flags, define unshare() syscall." 2012-08-14 12:14:29 -07:00
Elliott Hughes
dc320d99f1 am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
* commit '82b69fcbb3cc94bcde82c72d5c66fb3b504cdb6e':
  linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:14:13 -07:00
Elliott Hughes
b6d6ec5326 am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
  Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -07:00
Elliott Hughes
82b69fcbb3 am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
* commit 'b9c6854cd9d5286f991aec66be3a8a57f5e3e7be':
  linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:11:54 -07:00
Elliott Hughes
370a70948a am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
* commit 'c50e019734fb379e2efc1d50e188dd51cf085b96':
  Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:11:53 -07:00
Jeff Sharkey
74c0464006 Update MS_ mount flags, define unshare() syscall.
(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)

Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d
2012-08-14 12:09:25 -07:00