Christopher Ferris
f36c3ea8ff
resolved conflicts for merge of 85e0dd89
to master
...
Change-Id: I21f7ffb9a582681877e2dbad54185ee37d18410e
2013-12-18 23:43:36 -08:00
Christopher Ferris
be5231442b
Remove the non-uapi kernel headers.
...
Bug: 11559337
Change-Id: Id1ee4dadbd673cf35b9c79bc87f9a6fb7b2253c6
2013-12-18 10:34:18 -08:00
Christopher Ferris
9bed351f79
am 64edf779
: am 7dfd8ae1
: am 513d2770
: Merge "Add ioprio.h."
...
* commit '64edf779d79fd81a39ee5e0327f585b37cd828f2':
Add ioprio.h.
2013-12-12 23:51:17 +00:00
Christopher Ferris
802a0a7285
Add ioprio.h.
...
Change-Id: I153d05c5b6e9d640e319d65acb48b9cb12b6dafb
2013-12-12 15:23:22 -08:00
Elliott Hughes
356a4e4a32
Regenerate the bionic headers to match external/kernel-headers.
...
(This undoes the AOSP-only ion.h hack.)
Bug: 11859767
Change-Id: Id863c70d63b2716ae22cafd7ddb1163bbc7a3d11
2013-11-25 14:09:12 -08:00
Elliott Hughes
ee6b6f167a
am aee38bc0
: am 5a52bd34
: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
...
* commit 'aee38bc05ff0cd1294d079909c27732249507abd':
Regenerate the bionic kernel headers to match external/kernel-headers.
2013-11-25 14:05:10 -08:00
Elliott Hughes
c43d16a458
Regenerate the bionic kernel headers to match external/kernel-headers.
...
Bug: 11859767
Change-Id: I3d746188a1c4bdf8db1358521438435d3e63dbac
2013-11-25 13:50:55 -08:00
Christopher Ferris
2884789cfa
am cf8500fd
: am cda0c61d
: am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit 'cf8500fd4359bd026829bdfd0dc4968ed07cc842':
Delete non-uapi headers.
2013-11-24 00:27:51 -08:00
Christopher Ferris
cda0c61dc7
am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
Delete non-uapi headers.
2013-11-24 00:20:23 -08:00
Christopher Ferris
59a6012367
am 30aebed9
: am 038919d3
: am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '30aebed98ab66329d62e0884209fd9d04a8b056f':
Update script to copy in extra generated files.
2013-11-23 12:41:04 -08:00
Christopher Ferris
e5a9200534
Delete non-uapi headers.
...
Update headers and delete non-uapi headers that have been removed from
external/kernel-headers project.
Change-Id: I9ed9632a941095fe1bf3b207bafe1151f00de033
2013-11-23 08:01:25 -08:00
Christopher Ferris
038919d37c
am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '507f95e22b39fb58b9ffbba38ab593475b926af5':
Update script to copy in extra generated files.
2013-11-22 17:22:10 -08:00
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
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
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
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
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
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
Christopher Ferris
26f0e54ae0
Merge "Script to grab uapi headers from android kernel."
2013-11-21 22:20:14 +00: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
8cb52b056c
Regenerate uapi header files.
...
Change-Id: Idc934ed8ae17aba3300e4022e9b42177b0907e9d
2013-11-21 13:43:23 -08: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
15a6494856
Merge "Remove obsolete kernel/arch-mips headers."
2013-11-21 17:04:44 +00: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
Christopher Ferris
37e5c6ba89
am 750668f5
: am 862faa12
: Merge "Pull in cleaned version.h header."
...
* commit '750668f5abd9813bea6f33cb84d941ae306afea8':
Pull in cleaned version.h header.
2013-11-21 08:09:59 -08:00
Elliott Hughes
b867fd6825
Remove obsolete kernel/arch-mips headers.
...
Bug: 11559337
Change-Id: I70e205ff1f5acd07fddd7d82367e818b13847acd
2013-11-20 18:09:34 -08:00
Elliott Hughes
5cb66cfdc2
Remove the unused arch-x86 and arch-x86-64 kernel headers.
...
x86-64 already used uapi headers, and x86 can too now.
Bug: 11559337
Change-Id: I1196d2500f06ad40f2488b96fc8ccc7e02c7d5c0
2013-11-19 16:57:42 -08:00
Christopher Ferris
e372ec8cf9
Pull in cleaned version.h header.
...
Change-Id: Ia917af9336b63ed5a10147770a8110134cb274cb
2013-11-15 16:29:28 -08:00
Elliott Hughes
ad7e42d6bd
am 1b782289
: am 5a70acd1
: am ae5c3dd7
: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
...
* commit '1b782289f4f89434693e3e906df9c9cf43b4d277':
Remove the mips regdef.h and fpregdef.h old kernel headers.
2013-11-13 18:47:59 -08:00
Elliott Hughes
1b782289f4
am 5a70acd1
: am ae5c3dd7
: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
...
* commit '5a70acd176a792868a61c94169d5e6c0679202f2':
Remove the mips regdef.h and fpregdef.h old kernel headers.
2013-11-13 16:28:37 -08:00
Elliott Hughes
007eced93b
Remove the mips regdef.h and fpregdef.h old kernel headers.
...
Bug: 11559337
Change-Id: I6352cac9c4ef425cb21e34d0299223711ec079af
2013-11-13 16:13:01 -08:00
Elliott Hughes
5ebfaf84df
am 5c56512e
: am cdd6fdec
: am 6768c1ee
: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
...
* commit '5c56512eebc14558a2b3b83cdca09f04084d609c':
Add a temporary uapi/linux/compiler.h until upstream has one.
2013-11-08 16:03:52 -08:00
Elliott Hughes
5c56512eeb
am cdd6fdec
: am 6768c1ee
: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
...
* commit 'cdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869':
Add a temporary uapi/linux/compiler.h until upstream has one.
2013-11-08 15:25:38 -08:00
Elliott Hughes
740531354e
Add a temporary uapi/linux/compiler.h until upstream has one.
...
Bug: 11559337
Change-Id: I205974b1a26e4f85d0e11503afa80669195d211c
2013-11-08 15:13:54 -08:00
Elliott Hughes
0538d38a30
am 26d8853a
: am cac7eec5
: am 68723453
: Merge "Generate the uapi headers for mips and x86/x86_64."
...
* commit '26d8853ab5d3c42654a90bf31e54bb851f3b083c':
Generate the uapi headers for mips and x86/x86_64.
2013-11-08 14:28:57 -08:00
Elliott Hughes
26d8853ab5
am cac7eec5
: am 68723453
: Merge "Generate the uapi headers for mips and x86/x86_64."
...
* commit 'cac7eec55a4853abfcd5b8d7bce35d79ab330132':
Generate the uapi headers for mips and x86/x86_64.
2013-11-08 14:23:38 -08:00
Elliott Hughes
abd626117c
Generate the uapi headers for mips and x86/x86_64.
...
Bug: 11559337
Change-Id: I23b1a43e7bfa8fa6f9df7e59d2e731a0ec52dafc
2013-11-08 11:46:03 -08:00
Rom Lemarchand
d1cd2392c9
Merge "Refresh libc/kernel/common/linux/ion.h"
2013-11-07 13:29:57 +00:00
Ben Cheng
64aca718ee
am 99205dc9
: am af10f9e9
: Merge "Add processed uapi kernel headers for ARM."
...
* commit '99205dc987735e1d57f2e1b8446448f655808ab5':
Add processed uapi kernel headers for ARM.
2013-11-06 16:10:15 -08:00
Elliott Hughes
a047e0ab51
am afc51b92
: am c4dbc16e
: Merge "Make cpp.py less braindead."
...
* commit 'afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
Make cpp.py less braindead.
2013-11-06 16:10:12 -08:00
Ben Cheng
af10f9e927
Merge "Add processed uapi kernel headers for ARM."
2013-11-06 23:55:25 +00:00
Ben Cheng
a6b53f03c7
Add processed uapi kernel headers for ARM.
...
Change-Id: Id34de841b7b4b5a1bf7d22eb793860f92f24a6e5
2013-11-06 15:51:05 -08:00
Elliott Hughes
40596aa005
Make cpp.py less braindead.
...
The old code ignored operator precedence (!), despite having two tables
of operator precedence. The code's still pretty awful, but I've cleaned
it up enough to fix this, the most important bug.
This patch lets us correctly clean the uapi unistd.h, stat.h, and swab.h files,
and also fixes the mess we were already making of various old kernel
header files. I've added a bunch more tests, fixed the existing tests that
the existing script was already failing (!), and changed the script so that
the tests are run every time the script is run.
We can probably remove some of the old kernel header files that we were
parsing incorrectly, but we can worry about that later.
Bug: 11253477
Change-Id: Ie66c65b3a7ae13b4e98ed8038a6a534f06eae0e5
2013-11-06 12:04:48 -08:00
Rom Lemarchand
ea699f0cf4
Refresh libc/kernel/common/linux/ion.h
...
Change-Id: Ibd2bf99224b31bbad7b3a9b0d82bfef19162db7b
2013-11-06 09:55:03 -08:00