Christopher Ferris
b4091e69f1
Update script to copy in extra generated files.
...
There are files in generated/asm that simply include asm-generic files. The
script now copies any file in generated/asm that also exists in asm-generic.
Change-Id: I075161c68624e9e9e81797224831988ce02220eb
2013-11-22 17:04:34 -08:00
The Android Open Source Project
f00c938c7f
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
...
Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
2013-11-22 13:38:33 -08:00
Christopher Ferris
bbbf505c1d
am e3bc2254
: am a626e4d8
: am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit 'e3bc2254138e92d1b4746709ec355a5bd43bbccd':
Script to grab uapi headers from android kernel.
2013-11-21 23:00:03 -08:00
Elliott Hughes
6211255a6b
am 68a4187c
: am 50f6b836
: am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit '68a4187c4a88a885b36412607797e7ca65662968':
Regenerate uapi header files.
2013-11-21 23:00:02 -08:00
Elliott Hughes
3eba84eee0
am 81768e18
: am 5e818b33
: am 880d0e6c
: Merge "Remove hidden __reboot from header"
...
* commit '81768e18bb2e7c29917e1f4c188285c64498f61d':
Remove hidden __reboot from header
2013-11-21 23:00:01 -08:00
Elliott Hughes
6bc95b6906
am 8acd5dd2
: am 84336795
: am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit '8acd5dd2f82ecbf57c275528d5f2e5db0ef60a34':
Add support for the ternary operator to the header scrubber.
2013-11-21 23:00:01 -08:00
Elliott Hughes
5d352e6acd
am 5a2526ac
: am cb478f23
: am d4143c8e
: Merge "Fix useconds_t for LP64."
...
* commit '5a2526ac629802ff22f71d516f7979f1f4a4c34d':
Fix useconds_t for LP64.
2013-11-21 23:00:00 -08:00
Elliott Hughes
57f4718cfc
am 03adedfc
: am a18a01f5
: am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit '03adedfc3c8d25939d8799ed2ce9292b063d8bc7':
Remove obsolete kernel/arch-mips headers.
2013-11-21 22:59:59 -08:00
Elliott Hughes
15428215c6
am b749a010
: am 8637bb53
: am b135f6e5
: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit 'b749a010a3cf6b1544d1e27b360ffcb98ae1cdbc':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 22:59:59 -08:00
Elliott Hughes
5df692fd4e
am a38dcc02
: am 70d37e34
: am ca045a19
: Merge "Switch to upstream sleep(3) and usleep(3)."
...
* commit 'a38dcc0210ad2f75aac72e2c3bef357bddb7b564':
Switch to upstream sleep(3) and usleep(3).
2013-11-21 20:08:22 -08:00
Christopher Ferris
e3bc225413
am a626e4d8
: am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit 'a626e4d8bc3d59cc328942fc30ffc04981b154ed':
Script to grab uapi headers from android kernel.
2013-11-21 18:43:58 -08:00
Elliott Hughes
68a4187c4a
am 50f6b836
: am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit '50f6b8363e1429316311450f2a3041040977d67c':
Regenerate uapi header files.
2013-11-21 18:43:57 -08:00
Elliott Hughes
81768e18bb
am 5e818b33
: am 880d0e6c
: Merge "Remove hidden __reboot from header"
...
* commit '5e818b331430c34c42259a1405a75cc4106a27d0':
Remove hidden __reboot from header
2013-11-21 18:43:51 -08:00
Elliott Hughes
8acd5dd2f8
am 84336795
: am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit '843367953f40ee84bcc53e08a60c82215303e1fb':
Add support for the ternary operator to the header scrubber.
2013-11-21 18:43:48 -08:00
Elliott Hughes
5a2526ac62
am cb478f23
: am d4143c8e
: Merge "Fix useconds_t for LP64."
...
* commit 'cb478f23cc3765e3193beaf83fb35dd2d353d301':
Fix useconds_t for LP64.
2013-11-21 18:43:47 -08:00
Elliott Hughes
03adedfc3c
am a18a01f5
: am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit 'a18a01f553ce5350923c470c144dca87dfc8e992':
Remove obsolete kernel/arch-mips headers.
2013-11-21 18:43:47 -08:00
Elliott Hughes
b749a010a3
am 8637bb53
: am b135f6e5
: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit '8637bb5345bce20374ed345490d6de80cb874554':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 18:43:46 -08:00
Elliott Hughes
a38dcc0210
am 70d37e34
: am ca045a19
: Merge "Switch to upstream sleep(3) and usleep(3)."
...
* commit '70d37e343aa0c8c771e01259377c98958fbfd3ee':
Switch to upstream sleep(3) and usleep(3).
2013-11-21 17:15:03 -08:00
Elliott Hughes
3bc173dfad
am 7c883327
: am 556c7402
: am 39bc7ecd
: Merge "Fix <signal.h> for mips uapi."
...
* commit '7c88332701cc9aa2ed95148bed40f50c54adb36b':
Fix <signal.h> for mips uapi.
2013-11-21 17:12:04 -08:00
Elliott Hughes
7c88332701
am 556c7402
: am 39bc7ecd
: Merge "Fix <signal.h> for mips uapi."
...
* commit '556c740298a07e586c423480328231cfd50966b6':
Fix <signal.h> for mips uapi.
2013-11-21 17:07:47 -08:00
Christopher Ferris
a626e4d8bc
am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit '26f0e54ae083727ee66ee35531ed00338570d792':
Script to grab uapi headers from android kernel.
2013-11-21 14:22:49 -08:00
Christopher Ferris
26f0e54ae0
Merge "Script to grab uapi headers from android kernel."
2013-11-21 22:20:14 +00:00
Elliott Hughes
50f6b8363e
am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit 'fa7b48bf8753690bd15706a1fe3d23cf5c42782f':
Regenerate uapi header files.
2013-11-21 14:11:39 -08:00
Christopher Ferris
e994d41578
Script to grab uapi headers from android kernel.
...
Change-Id: Ia140e3ab27fbfee6b02f04c085f3e0e351bbe68d
2013-11-21 14:09:54 -08:00
Elliott Hughes
fa7b48bf87
Merge "Regenerate uapi header files."
2013-11-21 22:06:14 +00:00
Elliott Hughes
8cb52b056c
Regenerate uapi header files.
...
Change-Id: Idc934ed8ae17aba3300e4022e9b42177b0907e9d
2013-11-21 13:43:23 -08:00
Elliott Hughes
5e818b3314
am 880d0e6c
: Merge "Remove hidden __reboot from header"
...
* commit '880d0e6c64eb49736125648d1539726629308316':
Remove hidden __reboot from header
2013-11-21 12:41:56 -08:00
Elliott Hughes
880d0e6c64
Merge "Remove hidden __reboot from header"
2013-11-21 20:37:26 +00:00
Pavel Chupin
811cba00af
Remove hidden __reboot from header
...
This change is required:
https://android-review.googlesource.com/#/c/70570
Change-Id: Idb991f96a424aa5b0f9e06d9fb787fe8c8530750
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-11-22 00:19:34 +04:00
Elliott Hughes
843367953f
am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit 'eec57b370642f1b83285883104f2e778f32eef73':
Add support for the ternary operator to the header scrubber.
2013-11-21 11:34:47 -08:00
Elliott Hughes
eec57b3706
Merge "Add support for the ternary operator to the header scrubber."
2013-11-21 19:30:22 +00:00
Elliott Hughes
1198fd3864
Add support for the ternary operator to the header scrubber.
...
Used in various uapi headers.
Change-Id: Id0f862d2adc7ddc9727e8a29160d5435f8d547c3
2013-11-21 11:12:34 -08:00
Elliott Hughes
b55bc155f6
am 0b4ca7e3
: am 004ecb39
: am db1dec1e
: Merge "Clean up pthread_internal_t."
...
* commit '0b4ca7e3ce59e6993b47cb7856e74c3c46b44c9b':
Clean up pthread_internal_t.
2013-11-21 10:15:35 -08:00
Christopher Ferris
96a2e56fad
am 47580cc0
: am 3c6d1b88
: am 2a34009f
: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."
...
* commit '47580cc01768dcb67ab152915a2e78a98e36b463':
Add .cfi_startproc/.cfi_endproc to ENTRY/END.
2013-11-21 10:15:34 -08:00
Elliott Hughes
07f35d9596
am 3eb08b0e
: am f4e03b03
: am bf652a5f
: Merge "Provide <sys/user.h>."
...
* commit '3eb08b0e298e5b283add3a6a1abf0026d7cbcd98':
Provide <sys/user.h>.
2013-11-21 10:15:33 -08:00
Elliott Hughes
0b4ca7e3ce
am 004ecb39
: am db1dec1e
: Merge "Clean up pthread_internal_t."
...
* commit '004ecb39e1cc0aed57b6185d4adf015b61b2d0c6':
Clean up pthread_internal_t.
2013-11-21 10:12:26 -08:00
Christopher Ferris
47580cc017
am 3c6d1b88
: am 2a34009f
: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."
...
* commit '3c6d1b887692ecc7198e5292d49e3635b68fa95c':
Add .cfi_startproc/.cfi_endproc to ENTRY/END.
2013-11-21 10:12:25 -08:00
Elliott Hughes
3eb08b0e29
am f4e03b03
: am bf652a5f
: Merge "Provide <sys/user.h>."
...
* commit 'f4e03b03656527caf88b9e582ab5ca19ae697700':
Provide <sys/user.h>.
2013-11-21 10:12:24 -08:00
Elliott Hughes
cb478f23cc
am d4143c8e
: Merge "Fix useconds_t for LP64."
...
* commit 'd4143c8e4cd8b006d8f422883b53684881e0991a':
Fix useconds_t for LP64.
2013-11-21 09:07:15 -08:00
Elliott Hughes
a18a01f553
am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit '15a64948567e6e885f639070fa1cc56900dcbae0':
Remove obsolete kernel/arch-mips headers.
2013-11-21 09:07:14 -08:00
Elliott Hughes
8637bb5345
am b135f6e5
: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit 'b135f6e58cc81a6de64c55017d25496003ebe547':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 09:07:13 -08:00
Elliott Hughes
d4143c8e4c
Merge "Fix useconds_t for LP64."
2013-11-21 17:05:04 +00:00
Elliott Hughes
15a6494856
Merge "Remove obsolete kernel/arch-mips headers."
2013-11-21 17:04:44 +00:00
Elliott Hughes
b135f6e58c
Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
2013-11-21 17:04:24 +00:00
Elliott Hughes
9c67d4307c
Fix useconds_t for LP64.
...
Change-Id: I869e60484999c1feda3dcdb86bee5b5373e6b3df
2013-11-21 08:55:46 -08:00
Elliott Hughes
0e309c87ab
am 0df47ece
: am d5a59aa7
: am 1b2d214b
: Merge "Clean up forking and cloning."
...
* commit '0df47ece78b2e596dde3a2369b44917842bbbd4b':
Clean up forking and cloning.
2013-11-21 08:12:58 -08:00
Narayan Kamath
241776e21e
am 6e5fda6b
: am 22b8c53e
: am 9d70ddc4
: Merge "Add test case for 1^NaN"
...
* commit '6e5fda6b6d2b15155d8ca1ef586cf8ce6e04a067':
Add test case for 1^NaN
2013-11-21 08:12:57 -08:00
Elliott Hughes
7a7429b4f7
am 67026112
: am 8154f010
: am 318e86ed
: Merge "bionic: call stdio cleanup on exit"
...
* commit '67026112a00b94f9d13c3adea2ffbb4fb83d55c5':
bionic: call stdio cleanup on exit
2013-11-21 08:12:57 -08:00
Elliott Hughes
9280a859a6
am 86ae0ff1
: am 044d4655
: am 303fe0cb
: Merge "Fix pthread_join."
...
* commit '86ae0ff135456b2b695f49cf40ccc4e8ebc60f51':
Fix pthread_join.
2013-11-21 08:12:56 -08:00
Christopher Ferris
54b98c638a
am 37e5c6ba
: am 750668f5
: am 862faa12
: Merge "Pull in cleaned version.h header."
...
* commit '37e5c6ba89b9daca67b1c09e2b73b4c6eac805a5':
Pull in cleaned version.h header.
2013-11-21 08:12:55 -08:00