am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread

Browse Source

Merge commit '1f0003f57da3f9805af9ab883d5255be58cf4439' into gingerbread-plus-aosp

* commit '1f0003f57da3f9805af9ab883d5255be58cf4439':
  Unify NDK platform headers.

...

This commit is contained in:

David 'Digit' Turner

2010-09-23 08:25:36 -07:00

committed by Android Git Automerger

parent 3211cc0abf 1f0003f57d

commit 9de6872b4c

1585 changed files with 672 additions and 60461 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

ndk/platforms/android-3/arch-arm/usr/include/asm/a.out.h → ndk/platforms/android-3/arch-arm/include/asm/a.out.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h → ndk/platforms/android-3/arch-arm/include/asm/arch/board-perseus2.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board.h → ndk/platforms/android-3/arch-arm/include/asm/arch/board.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h → ndk/platforms/android-3/arch-arm/include/asm/arch/cpu.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h → ndk/platforms/android-3/arch-arm/include/asm/arch/dma.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h → ndk/platforms/android-3/arch-arm/include/asm/arch/fpga.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h → ndk/platforms/android-3/arch-arm/include/asm/arch/gpio-switch.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h → ndk/platforms/android-3/arch-arm/include/asm/arch/gpio.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h → ndk/platforms/android-3/arch-arm/include/asm/arch/hardware.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/io.h → ndk/platforms/android-3/arch-arm/include/asm/arch/io.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h → ndk/platforms/android-3/arch-arm/include/asm/arch/irqs.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h → ndk/platforms/android-3/arch-arm/include/asm/arch/mcbsp.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h → ndk/platforms/android-3/arch-arm/include/asm/arch/memory.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h → ndk/platforms/android-3/arch-arm/include/asm/arch/mtd-xip.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h → ndk/platforms/android-3/arch-arm/include/asm/arch/mux.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h → ndk/platforms/android-3/arch-arm/include/asm/arch/omap24xx.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h → ndk/platforms/android-3/arch-arm/include/asm/arch/serial.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h → ndk/platforms/android-3/arch-arm/include/asm/arch/timex.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h → ndk/platforms/android-3/arch-arm/include/asm/arch/vmalloc.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/atomic.h → ndk/platforms/android-3/arch-arm/include/asm/atomic.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/auxvec.h → ndk/platforms/android-3/arch-arm/include/asm/auxvec.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/bitops.h → ndk/platforms/android-3/arch-arm/include/asm/bitops.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/byteorder.h → ndk/platforms/android-3/arch-arm/include/asm/byteorder.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/cache.h → ndk/platforms/android-3/arch-arm/include/asm/cache.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/cacheflush.h → ndk/platforms/android-3/arch-arm/include/asm/cacheflush.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/cputime.h → ndk/platforms/android-3/arch-arm/include/asm/cputime.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/delay.h → ndk/platforms/android-3/arch-arm/include/asm/delay.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/div64.h → ndk/platforms/android-3/arch-arm/include/asm/div64.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/dma-mapping.h → ndk/platforms/android-3/arch-arm/include/asm/dma-mapping.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/dma.h → ndk/platforms/android-3/arch-arm/include/asm/dma.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/domain.h → ndk/platforms/android-3/arch-arm/include/asm/domain.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/dyntick.h → ndk/platforms/android-3/arch-arm/include/asm/dyntick.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/elf.h → ndk/platforms/android-3/arch-arm/include/asm/elf.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/errno.h → ndk/platforms/android-3/arch-arm/include/asm/errno.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/fcntl.h → ndk/platforms/android-3/arch-arm/include/asm/fcntl.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/fpstate.h → ndk/platforms/android-3/arch-arm/include/asm/fpstate.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/glue.h → ndk/platforms/android-3/arch-arm/include/asm/glue.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/hardirq.h → ndk/platforms/android-3/arch-arm/include/asm/hardirq.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/hardware.h → ndk/platforms/android-3/arch-arm/include/asm/hardware.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/hw_irq.h → ndk/platforms/android-3/arch-arm/include/asm/hw_irq.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/ide.h → ndk/platforms/android-3/arch-arm/include/asm/ide.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/io.h → ndk/platforms/android-3/arch-arm/include/asm/io.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/ioctl.h → ndk/platforms/android-3/arch-arm/include/asm/ioctl.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/ioctls.h → ndk/platforms/android-3/arch-arm/include/asm/ioctls.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/ipcbuf.h → ndk/platforms/android-3/arch-arm/include/asm/ipcbuf.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/irq.h → ndk/platforms/android-3/arch-arm/include/asm/irq.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/linkage.h → ndk/platforms/android-3/arch-arm/include/asm/linkage.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/local.h → ndk/platforms/android-3/arch-arm/include/asm/local.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/locks.h → ndk/platforms/android-3/arch-arm/include/asm/locks.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/mc146818rtc.h → ndk/platforms/android-3/arch-arm/include/asm/mc146818rtc.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/memory.h → ndk/platforms/android-3/arch-arm/include/asm/memory.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/mman.h → ndk/platforms/android-3/arch-arm/include/asm/mman.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/module.h → ndk/platforms/android-3/arch-arm/include/asm/module.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/msgbuf.h → ndk/platforms/android-3/arch-arm/include/asm/msgbuf.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/mtd-xip.h → ndk/platforms/android-3/arch-arm/include/asm/mtd-xip.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/page.h → ndk/platforms/android-3/arch-arm/include/asm/page.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/param.h → ndk/platforms/android-3/arch-arm/include/asm/param.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/percpu.h → ndk/platforms/android-3/arch-arm/include/asm/percpu.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/pgalloc.h → ndk/platforms/android-3/arch-arm/include/asm/pgalloc.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable-hwdef.h → ndk/platforms/android-3/arch-arm/include/asm/pgtable-hwdef.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable.h → ndk/platforms/android-3/arch-arm/include/asm/pgtable.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/poll.h → ndk/platforms/android-3/arch-arm/include/asm/poll.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/posix_types.h → ndk/platforms/android-3/arch-arm/include/asm/posix_types.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/proc-fns.h → ndk/platforms/android-3/arch-arm/include/asm/proc-fns.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/processor.h → ndk/platforms/android-3/arch-arm/include/asm/processor.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/procinfo.h → ndk/platforms/android-3/arch-arm/include/asm/procinfo.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/ptrace.h → ndk/platforms/android-3/arch-arm/include/asm/ptrace.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/resource.h → ndk/platforms/android-3/arch-arm/include/asm/resource.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/scatterlist.h → ndk/platforms/android-3/arch-arm/include/asm/scatterlist.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/semaphore.h → ndk/platforms/android-3/arch-arm/include/asm/semaphore.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/sembuf.h → ndk/platforms/android-3/arch-arm/include/asm/sembuf.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/shmbuf.h → ndk/platforms/android-3/arch-arm/include/asm/shmbuf.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/shmparam.h → ndk/platforms/android-3/arch-arm/include/asm/shmparam.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/sigcontext.h → ndk/platforms/android-3/arch-arm/include/asm/sigcontext.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/siginfo.h → ndk/platforms/android-3/arch-arm/include/asm/siginfo.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/signal.h → ndk/platforms/android-3/arch-arm/include/asm/signal.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/sizes.h → ndk/platforms/android-3/arch-arm/include/asm/sizes.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/smp.h → ndk/platforms/android-3/arch-arm/include/asm/smp.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/socket.h → ndk/platforms/android-3/arch-arm/include/asm/socket.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/sockios.h → ndk/platforms/android-3/arch-arm/include/asm/sockios.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock.h → ndk/platforms/android-3/arch-arm/include/asm/spinlock.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock_types.h → ndk/platforms/android-3/arch-arm/include/asm/spinlock_types.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/stat.h → ndk/platforms/android-3/arch-arm/include/asm/stat.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/statfs.h → ndk/platforms/android-3/arch-arm/include/asm/statfs.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/suspend.h → ndk/platforms/android-3/arch-arm/include/asm/suspend.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/system.h → ndk/platforms/android-3/arch-arm/include/asm/system.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/termbits.h → ndk/platforms/android-3/arch-arm/include/asm/termbits.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/termios.h → ndk/platforms/android-3/arch-arm/include/asm/termios.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/thread_info.h → ndk/platforms/android-3/arch-arm/include/asm/thread_info.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/timex.h → ndk/platforms/android-3/arch-arm/include/asm/timex.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/tlbflush.h → ndk/platforms/android-3/arch-arm/include/asm/tlbflush.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/topology.h → ndk/platforms/android-3/arch-arm/include/asm/topology.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/types.h → ndk/platforms/android-3/arch-arm/include/asm/types.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/uaccess.h → ndk/platforms/android-3/arch-arm/include/asm/uaccess.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/unaligned.h → ndk/platforms/android-3/arch-arm/include/asm/unaligned.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/unistd.h → ndk/platforms/android-3/arch-arm/include/asm/unistd.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/user.h → ndk/platforms/android-3/arch-arm/include/asm/user.h

0

ndk/platforms/android-3/arch-arm/usr/include/asm/vga.h → ndk/platforms/android-3/arch-arm/include/asm/vga.h

0

ndk/platforms/android-3/arch-arm/usr/include/fenv.h → ndk/platforms/android-3/arch-arm/include/fenv.h

0

ndk/platforms/android-3/arch-arm/usr/include/machine/_types.h → ndk/platforms/android-3/arch-arm/include/machine/_types.h

Some files were not shown because too many files have changed in this diff Show More