diff --git a/ndk/build/core/main.mk b/ndk/build/core/main.mk index a07e3b3c7..c4ac8fe1b 100644 --- a/ndk/build/core/main.mk +++ b/ndk/build/core/main.mk @@ -249,7 +249,7 @@ all: installed_modules host_libraries host_executables # XXX: For now, only support one platform and one target ABI with # only one toolchain. # -TARGET_PLATFORM := android-1.5 +TARGET_PLATFORM := android-3 TARGET_ARCH_ABI := arm TARGET_ARCH := arm TARGET_TOOLCHAIN := $(NDK_TARGET_TOOLCHAIN) diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/alloca.h b/ndk/build/platforms/android-3/arch-arm/usr/include/alloca.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/alloca.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/alloca.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/android/log.h b/ndk/build/platforms/android-3/arch-arm/usr/include/android/log.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/android/log.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/android/log.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/arm/fenv.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arm/fenv.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/arm/fenv.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/arm/fenv.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/arpa/inet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/inet.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/arpa/inet.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/arpa/inet.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/arpa/nameser.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/nameser.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/arpa/nameser.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/arpa/nameser.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/4level-fixup.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/4level-fixup.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/audit_dir_write.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/audit_dir_write.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/__ffs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/__ffs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/atomic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/ffz.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/ffz.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/find.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/find.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/fls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/fls.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/fls64.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/fls64.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/le.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/le.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/non-atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bitops/non-atomic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bug.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/bug.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/cputime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/cputime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/emergency-restart.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/emergency-restart.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/errno-base.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/errno-base.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/errno.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/fcntl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/fcntl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/futex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/futex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/ipc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/ipc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/local.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/local.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/local.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/local.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/memory_model.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/memory_model.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/mman.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/mman.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/mutex-xchg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/mutex-xchg.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/percpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/percpu.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/pgtable-nopud.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/pgtable-nopud.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/pgtable.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/pgtable.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/poll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/resource.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/resource.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/sections.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/sections.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/siginfo.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/siginfo.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/signal.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/signal.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/tlb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/tlb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/topology.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/topology.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/xor.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm-generic/xor.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/a.out.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/a.out.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/a.out.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/a.out.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/board-perseus2.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/board-perseus2.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/board.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/board.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/cpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/cpu.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/dma.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/dma.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/fpga.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/fpga.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/gpio-switch.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/gpio-switch.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/gpio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/gpio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/hardware.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/hardware.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/io.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/io.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/io.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/io.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/irqs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/irqs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mcbsp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mcbsp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/memory.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/memory.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mtd-xip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mtd-xip.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mux.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/mux.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/omap24xx.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/omap24xx.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/serial.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/serial.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/timex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/timex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/vmalloc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/arch/vmalloc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/atomic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/atomic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/atomic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/auxvec.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/auxvec.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/auxvec.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/auxvec.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/bitops.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/bitops.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/bitops.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/bitops.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/byteorder.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/byteorder.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/byteorder.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/byteorder.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cache.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cache.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cache.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/cache.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cacheflush.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cacheflush.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cacheflush.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/cacheflush.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cputime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cputime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/cputime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/cputime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/delay.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/delay.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/delay.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/delay.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/div64.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/div64.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/div64.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/div64.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dma-mapping.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/dma-mapping.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dma-mapping.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/dma-mapping.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dma.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/dma.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dma.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/dma.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/domain.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/domain.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/domain.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/domain.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dyntick.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/dyntick.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/dyntick.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/dyntick.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/elf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/elf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/elf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/errno.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/errno.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/fcntl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/fcntl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/fcntl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/fpstate.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/fpstate.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/fpstate.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/fpstate.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/glue.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/glue.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/glue.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/glue.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hardirq.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/hardirq.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hardirq.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/hardirq.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hardware.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/hardware.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hardware.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/hardware.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hw_irq.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/hw_irq.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/hw_irq.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/hw_irq.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ide.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/ide.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ide.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/ide.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/io.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/io.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/io.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/io.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ioctls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/ioctls.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ioctls.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/ioctls.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ipcbuf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/ipcbuf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ipcbuf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/ipcbuf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/irq.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/irq.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/irq.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/irq.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/linkage.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/linkage.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/linkage.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/linkage.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/local.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/local.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/local.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/local.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/locks.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/locks.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/locks.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/locks.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mc146818rtc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/mc146818rtc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mc146818rtc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/mc146818rtc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/memory.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/memory.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/memory.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/memory.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mman.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/mman.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mman.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/mman.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/module.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/module.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/module.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/module.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/msgbuf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/msgbuf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/msgbuf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/msgbuf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mtd-xip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/mtd-xip.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/mtd-xip.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/mtd-xip.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/page.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/page.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/page.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/page.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/param.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/param.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/param.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/param.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/percpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/percpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/percpu.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/percpu.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgalloc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgalloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgalloc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgalloc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgtable-hwdef.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgtable-hwdef.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgtable-hwdef.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgtable-hwdef.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgtable.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgtable.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/pgtable.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/pgtable.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/poll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/poll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/posix_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/posix_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/posix_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/posix_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/proc-fns.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/proc-fns.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/proc-fns.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/proc-fns.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/processor.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/processor.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/processor.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/processor.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/procinfo.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/procinfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/procinfo.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/procinfo.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ptrace.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/ptrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/ptrace.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/ptrace.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/resource.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/resource.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/resource.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/scatterlist.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/scatterlist.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/scatterlist.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/scatterlist.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/semaphore.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/semaphore.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/semaphore.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/semaphore.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sembuf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/sembuf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sembuf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/sembuf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/shmbuf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/shmbuf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/shmbuf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/shmbuf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/shmparam.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/shmparam.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/shmparam.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/shmparam.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sigcontext.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/sigcontext.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sigcontext.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/sigcontext.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/siginfo.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/siginfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/siginfo.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/siginfo.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/signal.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/signal.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/signal.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sizes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/sizes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sizes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/sizes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/smp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/smp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/smp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/smp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/socket.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/socket.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/socket.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/socket.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sockios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/sockios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/sockios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/sockios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/spinlock.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/spinlock.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/spinlock.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/spinlock.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/spinlock_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/spinlock_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/spinlock_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/spinlock_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/stat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/stat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/stat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/statfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/statfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/statfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/statfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/suspend.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/suspend.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/suspend.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/suspend.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/system.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/system.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/system.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/system.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/termbits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/termbits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/termbits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/termbits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/termios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/termios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/termios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/termios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/thread_info.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/thread_info.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/thread_info.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/thread_info.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/timex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/timex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/timex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/timex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/tlbflush.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/tlbflush.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/tlbflush.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/tlbflush.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/topology.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/topology.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/topology.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/topology.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/uaccess.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/uaccess.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/uaccess.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/uaccess.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/unaligned.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/unaligned.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/unaligned.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/unaligned.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/unistd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/unistd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/unistd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/user.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/user.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/user.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/user.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/vga.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/vga.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/asm/vga.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/asm/vga.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/assert.h b/ndk/build/platforms/android-3/arch-arm/usr/include/assert.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/assert.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/assert.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/byteswap.h b/ndk/build/platforms/android-3/arch-arm/usr/include/byteswap.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/byteswap.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/byteswap.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/cstddef b/ndk/build/platforms/android-3/arch-arm/usr/include/cstddef similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/cstddef rename to ndk/build/platforms/android-3/arch-arm/usr/include/cstddef diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/ctype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/ctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/ctype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/ctype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/dirent.h b/ndk/build/platforms/android-3/arch-arm/usr/include/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/dirent.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/dirent.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/dlfcn.h b/ndk/build/platforms/android-3/arch-arm/usr/include/dlfcn.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/dlfcn.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/dlfcn.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/elf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/elf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/elf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/endian.h b/ndk/build/platforms/android-3/arch-arm/usr/include/endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/endian.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/endian.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/err.h b/ndk/build/platforms/android-3/arch-arm/usr/include/err.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/err.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/err.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/errno.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/errno.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/fcntl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/fcntl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/fcntl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/features.h b/ndk/build/platforms/android-3/arch-arm/usr/include/features.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/features.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/features.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/fnmatch.h b/ndk/build/platforms/android-3/arch-arm/usr/include/fnmatch.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/fnmatch.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/fnmatch.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/getopt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/getopt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/getopt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/getopt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/grp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/grp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/grp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/grp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/inttypes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/inttypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/inttypes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/inttypes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/jni.h b/ndk/build/platforms/android-3/arch-arm/usr/include/jni.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/jni.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/jni.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/lastlog.h b/ndk/build/platforms/android-3/arch-arm/usr/include/lastlog.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/lastlog.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/lastlog.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/libgen.h b/ndk/build/platforms/android-3/arch-arm/usr/include/libgen.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/libgen.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/libgen.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/limits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/limits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/limits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/a.out.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/a.out.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/a.out.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/a.out.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/aio_abi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/aio_abi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/aio_abi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/aio_abi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/akm8976.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/akm8976.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/akm8976.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/akm8976.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_alarm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_alarm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_alarm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_alarm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_pmem.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_pmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_pmem.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_pmem.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_power.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_power.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/android_power.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/android_power.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/apm_bios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/apm_bios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/apm_bios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/apm_bios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ashmem.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ashmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ashmem.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ashmem.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ata.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ata.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ata.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ata.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmapi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmapi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmapi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmapi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmioc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmioc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmioc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmioc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmppp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmppp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmppp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmppp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmsap.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmsap.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/atmsap.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/atmsap.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/attribute_container.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/attribute_container.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/attribute_container.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/attribute_container.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/auto_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/auto_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/auto_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/auto_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/autoconf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/autoconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/autoconf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/autoconf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/auxvec.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/auxvec.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/auxvec.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/auxvec.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/backing-dev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/backing-dev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/backing-dev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/backing-dev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/binder.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/binder.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/binder.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/binder.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/binfmts.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/binfmts.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/binfmts.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/binfmts.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/bio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/bio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bitmap.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/bitmap.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bitmap.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/bitmap.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bitops.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/bitops.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/bitops.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/bitops.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blkdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/blkdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blkdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/blkdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blkpg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/blkpg.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blkpg.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/blkpg.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blockgroup_lock.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/blockgroup_lock.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/blockgroup_lock.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/blockgroup_lock.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/big_endian.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/big_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/big_endian.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/big_endian.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/generic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/generic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/generic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/generic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/little_endian.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/little_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/little_endian.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/little_endian.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/swab.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/swab.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/swab.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/swab.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/swabb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/swabb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/byteorder/swabb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/byteorder/swabb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cache.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/cache.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cache.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/cache.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/calc64.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/calc64.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/calc64.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/calc64.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/capability.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/capability.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/capability.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/capability.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/capi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/capi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/capi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/capi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/cdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/cdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cdrom.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/cdrom.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cdrom.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/cdrom.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/circ_buf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/circ_buf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/circ_buf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/circ_buf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/clk.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/clk.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/clk.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/clk.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/coda.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/coda.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/coda.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/coda.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/coda_fs_i.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/coda_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/coda_fs_i.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/coda_fs_i.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/compat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/compat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compiler-gcc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/compiler-gcc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compiler-gcc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/compiler-gcc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compiler.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/compiler.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/compiler.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/compiler.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/completion.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/completion.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/completion.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/completion.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/config.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/config.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/config.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/config.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/console_struct.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/console_struct.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/console_struct.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/console_struct.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/cpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cpu.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/cpu.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cpumask.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/cpumask.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/cpumask.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/cpumask.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ctype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ctype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ctype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dccp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dccp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/dccp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/debug_locks.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/debug_locks.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/debug_locks.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/debug_locks.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/delay.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/delay.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/delay.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/delay.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/device.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/device.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/device.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/device.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dirent.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dirent.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/dirent.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dm-ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/dm-ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dm-ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/dm-ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dma-mapping.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/dma-mapping.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dma-mapping.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/dma-mapping.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dmaengine.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/dmaengine.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/dmaengine.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/dmaengine.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_dir.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_dir.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_dir.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_dir.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_fs_i.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_fs_i.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_fs_i.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_fs_sb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_fs_sb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/efs_fs_sb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/efs_fs_sb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elevator.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/elevator.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elevator.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/elevator.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elf-em.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/elf-em.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elf-em.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/elf-em.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/elf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/elf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/err.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/err.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/err.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/err.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/errno.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/errno.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/errqueue.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/errqueue.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/errqueue.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/errqueue.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/etherdevice.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/etherdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/etherdevice.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/etherdevice.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ext2_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ext2_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ext2_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ext2_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ext3_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ext3_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ext3_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ext3_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fadvise.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/fadvise.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fadvise.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/fadvise.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/fb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/fb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fcntl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fcntl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/fcntl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/fd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/fd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/file.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/file.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/file.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/file.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/filter.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/filter.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/filter.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/filter.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ftape.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ftape.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ftape.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ftape.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/futex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/futex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/futex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/futex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/genhd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/genhd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/genhd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/genhd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/gfp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/gfp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/gfp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/gfp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hardirq.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/hardirq.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hardirq.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/hardirq.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdlc/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdlc/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdlc/ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdlc/ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdreg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdreg.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdreg.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdreg.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdsmart.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdsmart.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hdsmart.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/hdsmart.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/highmem.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/highmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/highmem.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/highmem.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hil.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/hil.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/hil.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/hil.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/i2c.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/i2c.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/i2c.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/i2c.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/icmp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/icmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/icmp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/icmp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_arcnet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_arcnet.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_arcnet.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_arcnet.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_arp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_arp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_arp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_bridge.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_bridge.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_bridge.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_bridge.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_ether.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_ether.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_ether.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_fc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_fc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_fc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_fc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_fddi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_fddi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_fddi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_fddi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_hippi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_hippi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_hippi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_hippi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_packet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_packet.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_packet.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_ppp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_ppp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_ppp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_ppp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_tr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_tr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_tr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_tr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_tun.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_tun.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_tun.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_tun.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_vlan.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_vlan.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/if_vlan.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/if_vlan.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/in.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/in.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/in.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/in.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/in6.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/in6.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/in6.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/in6.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/init.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/init.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/init.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/init.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/inotify.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/inotify.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/inotify.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/inotify.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/input.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/input.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/input.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/input.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/interrupt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/interrupt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/interrupt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/interrupt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioport.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioport.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioport.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioport.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioprio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioprio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ioprio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ioprio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ip.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ip.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ip.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipmi_msgdefs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipmi_msgdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipmi_msgdefs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipmi_msgdefs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipmi_smi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipmi_smi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipmi_smi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipmi_smi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipx.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipx.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ipx.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ipx.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irq.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/irq.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irq.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/irq.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irq_cpustat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/irq_cpustat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irq_cpustat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/irq_cpustat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irqflags.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/irqflags.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irqflags.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/irqflags.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irqreturn.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/irqreturn.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/irqreturn.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/irqreturn.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/jbd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/jbd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/jbd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/jbd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/jiffies.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/jiffies.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/jiffies.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/jiffies.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kdev_t.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kdev_t.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kdev_t.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kdev_t.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernel.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernel.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernel.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernel.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernel_stat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernel_stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernel_stat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernel_stat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernelcapi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernelcapi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kernelcapi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kernelcapi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kexec.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kexec.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kexec.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kexec.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/key.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/key.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/key.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/key.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/keyboard.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/keyboard.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/keyboard.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/keyboard.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/keychord.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/keychord.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/keychord.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/keychord.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/klist.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/klist.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/klist.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/klist.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kmod.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kmod.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kmod.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kmod.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kobject.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kobject.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kobject.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kobject.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kref.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/kref.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/kref.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/kref.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ktime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ktime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ktime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ktime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/limits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/limits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/limits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/linkage.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/linkage.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/linkage.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/linkage.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/list.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/list.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/list.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/list.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockd/nlm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockd/nlm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockd/nlm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockd/nlm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockd/xdr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockd/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockd/xdr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockd/xdr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockdep.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockdep.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/lockdep.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/lockdep.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/loop.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/loop.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/loop.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/loop.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/magic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/magic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/magic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/magic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/major.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/major.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/major.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/major.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mc146818rtc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mc146818rtc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mc146818rtc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mc146818rtc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mca.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mca.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mca.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mca.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mempolicy.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mempolicy.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mempolicy.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mempolicy.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mempool.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mempool.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mempool.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mempool.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/miscdevice.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/miscdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/miscdevice.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/miscdevice.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/card.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/card.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/card.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/card.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/host.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/host.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/host.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/host.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/mmc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/mmc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmc/mmc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmc/mmc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmzone.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmzone.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mmzone.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mmzone.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mod_devicetable.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mod_devicetable.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mod_devicetable.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mod_devicetable.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/module.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/module.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/module.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/module.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/moduleparam.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/moduleparam.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/moduleparam.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/moduleparam.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mount.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mount.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mount.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msdos_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/msdos_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msdos_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/msdos_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/msg.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msg.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/msg.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_adsp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_adsp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_adsp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_adsp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_audio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_audio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_audio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_audio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_mdp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_mdp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/msm_mdp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/msm_mdp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mt9t013.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mt9t013.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mt9t013.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mt9t013.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/bbm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/bbm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/bbm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/bbm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/blktrans.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/blktrans.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/blktrans.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/blktrans.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/cfi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/cfi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/cfi_endian.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/cfi_endian.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi_endian.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/compatmac.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/compatmac.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/compatmac.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/compatmac.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/flashchip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/flashchip.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/flashchip.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/flashchip.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/map.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/map.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/map.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/map.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/mtd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/mtd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/mtd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/mtd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nand.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nand.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nand.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nand.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nand_ecc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nand_ecc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nand_ecc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nand_ecc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nftl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nftl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/nftl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/nftl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/onenand_regs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/onenand_regs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/onenand_regs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/onenand_regs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/partitions.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/partitions.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtd/partitions.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtd/partitions.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mtio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mtio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mutex-debug.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mutex-debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mutex-debug.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mutex-debug.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mutex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/mutex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/mutex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/mutex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp_mount.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp_mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp_mount.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp_mount.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp_no.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp_no.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ncp_no.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ncp_no.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/net.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/net.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/net.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/net.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netdevice.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netdevice.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netdevice.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nfnetlink.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nfnetlink.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/x_tables.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/x_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/x_tables.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/x_tables.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_comment.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_comment.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_comment.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_comment.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_connbytes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_connbytes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_connbytes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_connbytes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_conntrack.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_conntrack.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_conntrack.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_dccp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_dccp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_dccp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_esp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_esp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_esp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_helper.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_helper.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_helper.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_helper.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_length.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_length.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_length.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_limit.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_limit.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_limit.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_limit.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_mac.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_mac.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_mac.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_multiport.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_multiport.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_multiport.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_multiport.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_physdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_physdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_physdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_pkttype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_pkttype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_pkttype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_pkttype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_quota.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_quota.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_quota.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_quota.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_realm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_realm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_realm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_realm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_sctp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_sctp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_sctp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_state.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_state.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_state.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_state.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_statistic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_statistic.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_statistic.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_statistic.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_string.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_string.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_string.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_string.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_arp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_arp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_bridge.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_bridge.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_bridge.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_bridge.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netlink.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/netlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/netlink.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/netlink.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs2.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs2.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs2.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs2.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs3.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs3.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs3.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs3.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs4.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs4.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs4.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs4.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs_xdr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs_xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfs_xdr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfs_xdr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsacl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsacl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsacl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsacl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/auth.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/auth.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/auth.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/auth.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/const.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/const.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/const.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/const.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/debug.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/debug.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/debug.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/export.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/export.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/export.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/export.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/interface.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/interface.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/interface.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/interface.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/nfsfh.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/nfsfh.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/nfsfh.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/nfsfh.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/stats.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/stats.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/stats.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/stats.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/xdr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nfsd/xdr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nfsd/xdr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/node.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/node.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/node.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/node.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nodemask.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nodemask.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nodemask.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nodemask.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/notifier.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/notifier.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/notifier.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/notifier.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/numa.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/numa.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/numa.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/numa.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nvram.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/nvram.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/nvram.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/nvram.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/omap_csmi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/omap_csmi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/omap_csmi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/omap_csmi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pagemap.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pagemap.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pagemap.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pagemap.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/param.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/param.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/param.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/param.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/patchkey.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/patchkey.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/patchkey.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/patchkey.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci_ids.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci_ids.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci_ids.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci_ids.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci_regs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci_regs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pci_regs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pci_regs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/percpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/percpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/percpu.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/percpu.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/percpu_counter.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/percpu_counter.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/percpu_counter.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/percpu_counter.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/personality.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/personality.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/personality.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/personality.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pfkeyv2.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pfkeyv2.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pfkeyv2.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pfkeyv2.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pkt_cls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pkt_cls.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pkt_cls.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pkt_cls.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pkt_sched.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pkt_sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pkt_sched.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pkt_sched.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/platform_device.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/platform_device.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/platform_device.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/platform_device.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/plist.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/plist.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/plist.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/plist.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pnp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/pnp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/pnp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/pnp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/poll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/poll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_acl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/posix_acl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_acl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/posix_acl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/posix_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/posix_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/posix_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ppdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ppdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ppdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ppdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ppp_defs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ppp_defs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ppp_defs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ppp_defs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/prctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/prctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/prctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/prctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/preempt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/preempt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/preempt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/preempt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/proc_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/proc_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/proc_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/proc_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ptrace.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ptrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ptrace.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ptrace.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/qic117.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/qic117.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/qic117.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/qic117.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/qnxtypes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/qnxtypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/qnxtypes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/qnxtypes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/quota.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/quota.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/quota.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/quota.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_k.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_k.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_k.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_k.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_p.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_p.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_p.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_p.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_u.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_u.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/md_u.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/md_u.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/xor.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/xor.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/raid/xor.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/raid/xor.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/random.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/random.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/random.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/random.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rbtree.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/rbtree.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rbtree.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/rbtree.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rcupdate.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/rcupdate.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rcupdate.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/rcupdate.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/reboot.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/reboot.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/reboot.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/reboot.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/relay.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/relay.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/relay.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/relay.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/resource.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/resource.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/resource.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/route.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/route.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/route.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/route.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rtc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/rtc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rtc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/rtc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rtnetlink.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/rtnetlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rtnetlink.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/rtnetlink.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rwsem.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/rwsem.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/rwsem.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/rwsem.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sched.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sched.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sched.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sem.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sem.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sem.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sem.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/seq_file.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/seq_file.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/seq_file.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/seq_file.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/seqlock.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/seqlock.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/seqlock.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/seqlock.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serial_core.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/serial_core.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serial_core.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/serial_core.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serial_reg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/serial_reg.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serial_reg.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/serial_reg.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/serio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/serio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/serio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/shm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/shm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/shm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/shm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/signal.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/signal.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/signal.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/skbuff.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/skbuff.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/skbuff.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/skbuff.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/slab.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/slab.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/slab.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/slab.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/smb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/smb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/smp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/smp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smp_lock.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/smp_lock.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/smp_lock.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/smp_lock.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/socket.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/socket.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/socket.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/socket.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sockios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sockios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sockios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sockios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/soundcard.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/soundcard.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/soundcard.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/soundcard.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_api_smp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_smp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_api_smp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_smp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_api_up.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_api_up.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_up.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_types_up.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_types_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_types_up.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_types_up.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_up.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/spinlock_up.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/spinlock_up.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stacktrace.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/stacktrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stacktrace.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/stacktrace.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/stat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/statfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/statfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/statfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/statfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stddef.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/stddef.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stddef.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/stddef.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/string.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/string.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/string.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/string.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stringify.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/stringify.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/stringify.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/stringify.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/auth.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/auth.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/auth_gss.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth_gss.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/auth_gss.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth_gss.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/clnt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/clnt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/clnt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/clnt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/debug.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/debug.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/debug.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_api.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_api.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_api.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_api.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_asn1.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_asn1.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_asn1.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_asn1.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_err.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_err.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/gss_err.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_err.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/msg_prot.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/msg_prot.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/msg_prot.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/msg_prot.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/sched.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/sched.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/sched.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/stats.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/stats.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/stats.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/stats.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/svc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/svc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/svcauth.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svcauth.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/svcauth.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svcauth.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/timer.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/timer.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/timer.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/timer.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/xdr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/xdr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xdr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/xprt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xprt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sunrpc/xprt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xprt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/swap.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/swap.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/swap.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/swap.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysdev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysdev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysdev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/sysfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/sysfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/taskstats.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/taskstats.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/taskstats.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/taskstats.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/taskstats_kern.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/taskstats_kern.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/taskstats_kern.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/taskstats_kern.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tcp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tcp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/tcp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/telephony.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/telephony.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/telephony.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/telephony.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/termios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/termios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/termios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/termios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/textsearch.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/textsearch.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/textsearch.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/textsearch.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/thread_info.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/thread_info.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/thread_info.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/thread_info.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/threads.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/threads.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/threads.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/threads.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/time.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/time.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/time.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/timer.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/timer.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/timer.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/timer.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/times.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/times.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/times.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/times.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/timex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/timex.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/timex.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/timex.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tiocl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/tiocl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tiocl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/tiocl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/transport_class.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/transport_class.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/transport_class.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/transport_class.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tty.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/tty.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/tty.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/tty.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/udp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/udp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/udp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/udp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ufs_fs_i.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ufs_fs_i.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_i.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ufs_fs_sb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_sb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/ufs_fs_sb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_sb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/uio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/uio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/uio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/uio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/un.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/un.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/un.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/un.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/unistd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/unistd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/unistd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/usb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/usb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usb_ch9.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/usb_ch9.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usb_ch9.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/usb_ch9.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usbdevice_fs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/usbdevice_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/usbdevice_fs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/usbdevice_fs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/user.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/user.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/user.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/user.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/utime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/utime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/utime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/utsname.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/utsname.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/utsname.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/utsname.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/version.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/version.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/version.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/version.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/vfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/vfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/videodev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/videodev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/videodev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/videodev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/videodev2.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/videodev2.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/videodev2.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/videodev2.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vmalloc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/vmalloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vmalloc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/vmalloc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/vt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/vt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vt_buffer.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/vt_buffer.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/vt_buffer.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/vt_buffer.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wait.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/wait.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wait.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/wait.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wanrouter.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/wanrouter.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wanrouter.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/wanrouter.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wireless.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/wireless.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/wireless.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/wireless.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/workqueue.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/workqueue.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/workqueue.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/workqueue.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/xattr.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/xattr.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/xattr.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/xattr.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zconf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/zconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zconf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/zconf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zlib.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/zlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zlib.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/zlib.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zorro_ids.h b/ndk/build/platforms/android-3/arch-arm/usr/include/linux/zorro_ids.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/linux/zorro_ids.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/linux/zorro_ids.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/locale.h b/ndk/build/platforms/android-3/arch-arm/usr/include/locale.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/locale.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/locale.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/asm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/asm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/asm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/asm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/cdefs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/cdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/cdefs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/cdefs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/cpu-features.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/cpu-features.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/cpu-features.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/cpu-features.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/exec.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/exec.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/exec.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/exec.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/ieee.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/ieee.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/ieee.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/ieee.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/internal_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/internal_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/internal_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/internal_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/kernel.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/kernel.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/kernel.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/kernel.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/limits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/limits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/limits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/setjmp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/machine/setjmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/machine/setjmp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/machine/setjmp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/malloc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/malloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/malloc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/malloc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/math.h b/ndk/build/platforms/android-3/arch-arm/usr/include/math.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/math.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/math.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/memory.h b/ndk/build/platforms/android-3/arch-arm/usr/include/memory.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/memory.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/memory.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/mntent.h b/ndk/build/platforms/android-3/arch-arm/usr/include/mntent.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/mntent.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/mntent.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/mtd/mtd-abi.h b/ndk/build/platforms/android-3/arch-arm/usr/include/mtd/mtd-abi.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/mtd/mtd-abi.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/mtd/mtd-abi.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/mtd/mtd-user.h b/ndk/build/platforms/android-3/arch-arm/usr/include/mtd/mtd-user.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/mtd/mtd-user.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/mtd/mtd-user.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/ethertypes.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/ethertypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/ethertypes.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/ethertypes.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_arp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_arp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_arp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_dl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_dl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_dl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_dl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_ether.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_ether.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_ether.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_ieee1394.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_ieee1394.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_ieee1394.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_ieee1394.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_packet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_packet.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_packet.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/if_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/if_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/if_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/net/route.h b/ndk/build/platforms/android-3/arch-arm/usr/include/net/route.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/net/route.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/net/route.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netdb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netdb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netdb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netdb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ether.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ether.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ether.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/if_ether.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/if_ether.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/if_ether.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in6.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in6.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in6.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in6.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in_systm.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in_systm.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/in_systm.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/in_systm.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ip.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ip.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ip.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ip_icmp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ip_icmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/ip_icmp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/ip_icmp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/tcp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/tcp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/tcp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/udp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netinet/udp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netinet/udp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netinet/udp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/netpacket/packet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/netpacket/packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/netpacket/packet.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/netpacket/packet.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/new b/ndk/build/platforms/android-3/arch-arm/usr/include/new similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/new rename to ndk/build/platforms/android-3/arch-arm/usr/include/new diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/nsswitch.h b/ndk/build/platforms/android-3/arch-arm/usr/include/nsswitch.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/nsswitch.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/nsswitch.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/pathconf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/pathconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/pathconf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/pathconf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/paths.h b/ndk/build/platforms/android-3/arch-arm/usr/include/paths.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/paths.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/paths.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/poll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/poll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/pthread.h b/ndk/build/platforms/android-3/arch-arm/usr/include/pthread.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/pthread.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/pthread.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/pwd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/pwd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/pwd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/pwd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/resolv.h b/ndk/build/platforms/android-3/arch-arm/usr/include/resolv.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/resolv.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/resolv.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sched.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sched.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sched.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/semaphore.h b/ndk/build/platforms/android-3/arch-arm/usr/include/semaphore.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/semaphore.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/semaphore.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/setjmp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/setjmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/setjmp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/setjmp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sgtty.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sgtty.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sgtty.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sgtty.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sha1.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sha1.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sha1.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sha1.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/signal.h b/ndk/build/platforms/android-3/arch-arm/usr/include/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/signal.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/signal.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/stdint.h b/ndk/build/platforms/android-3/arch-arm/usr/include/stdint.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/stdint.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/stdint.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/stdio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/stdio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/stdio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/stdio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/stdlib.h b/ndk/build/platforms/android-3/arch-arm/usr/include/stdlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/stdlib.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/stdlib.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/stl_pair.h b/ndk/build/platforms/android-3/arch-arm/usr/include/stl_pair.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/stl_pair.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/stl_pair.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/string.h b/ndk/build/platforms/android-3/arch-arm/usr/include/string.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/string.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/string.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/strings.h b/ndk/build/platforms/android-3/arch-arm/usr/include/strings.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/strings.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/strings.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_errdefs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/_errdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_errdefs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/_errdefs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_sigdefs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/_sigdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_sigdefs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/_sigdefs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_system_properties.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/_system_properties.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_system_properties.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/_system_properties.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/_types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/_types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/atomics.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/atomics.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/atomics.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/atomics.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/cdefs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/cdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/cdefs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/cdefs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/cdefs_elf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/cdefs_elf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/dirent.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/dirent.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/dirent.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/endian.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/endian.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/endian.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/epoll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/epoll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/epoll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/epoll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/errno.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/errno.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/exec_elf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/exec_elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/exec_elf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/exec_elf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/file.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/file.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/file.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/file.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/fsuid.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/fsuid.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/fsuid.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/fsuid.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/inotify.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/inotify.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/inotify.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/inotify.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ioctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ioctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ioctl_compat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ioctl_compat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ioctl_compat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ioctl_compat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ipc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ipc.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ipc.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/klog.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/klog.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/klog.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/klog.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/limits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/limits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/limits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/linux-syscalls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/linux-syscalls.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/linux-syscalls.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/linux-syscalls.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/linux-unistd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/linux-unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/linux-unistd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/linux-unistd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/mman.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/mman.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/mman.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/mman.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/mount.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/mount.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/mount.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/param.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/param.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/param.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/param.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/poll.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/poll.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/prctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/prctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/prctl.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/prctl.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ptrace.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ptrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ptrace.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ptrace.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/reboot.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/reboot.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/reboot.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/reboot.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/resource.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/resource.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/resource.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/select.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/select.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/select.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/select.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sendfile.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/sendfile.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sendfile.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/sendfile.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/socket.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/socket.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/socket.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/socket.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/socketcalls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/socketcalls.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/socketcalls.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/socketcalls.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/stat.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/stat.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/stat.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/statfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/statfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/statfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/statfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/syscall.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/syscall.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/syscall.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/syscall.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysconf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysconf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysconf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysinfo.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysinfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysinfo.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysinfo.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/syslimits.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/syslimits.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/syslimits.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/syslimits.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysmacros.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/sysmacros.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/system_properties.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/system_properties.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/system_properties.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/system_properties.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/time.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/time.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/time.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/timeb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/timeb.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/timeb.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/timeb.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/times.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/times.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/times.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/times.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ttychars.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ttychars.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ttychars.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ttychars.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ttydev.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/ttydev.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/ttydev.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/ttydev.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/types.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/types.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/types.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/uio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/uio.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/uio.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/uio.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/un.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/un.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/un.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/un.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/utime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/utime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/utime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/utsname.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/utsname.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/utsname.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/utsname.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/vfs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/vfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/vfs.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/vfs.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/vt.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/vt.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/vt.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/vt.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/wait.h b/ndk/build/platforms/android-3/arch-arm/usr/include/sys/wait.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/sys/wait.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/sys/wait.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/syslog.h b/ndk/build/platforms/android-3/arch-arm/usr/include/syslog.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/syslog.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/syslog.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/termios.h b/ndk/build/platforms/android-3/arch-arm/usr/include/termios.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/termios.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/termios.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/thread_db.h b/ndk/build/platforms/android-3/arch-arm/usr/include/thread_db.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/thread_db.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/thread_db.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/time.h b/ndk/build/platforms/android-3/arch-arm/usr/include/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/time.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/time.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/time64.h b/ndk/build/platforms/android-3/arch-arm/usr/include/time64.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/time64.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/time64.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/typeinfo b/ndk/build/platforms/android-3/arch-arm/usr/include/typeinfo similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/typeinfo rename to ndk/build/platforms/android-3/arch-arm/usr/include/typeinfo diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/unistd.h b/ndk/build/platforms/android-3/arch-arm/usr/include/unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/unistd.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/unistd.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/util.h b/ndk/build/platforms/android-3/arch-arm/usr/include/util.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/util.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/util.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/utility b/ndk/build/platforms/android-3/arch-arm/usr/include/utility similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/utility rename to ndk/build/platforms/android-3/arch-arm/usr/include/utility diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/utime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/utime.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/utime.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/utmp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/utmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/utmp.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/utmp.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/wchar.h b/ndk/build/platforms/android-3/arch-arm/usr/include/wchar.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/wchar.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/wchar.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/wctype.h b/ndk/build/platforms/android-3/arch-arm/usr/include/wctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/wctype.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/wctype.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/zconf.h b/ndk/build/platforms/android-3/arch-arm/usr/include/zconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/zconf.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/zconf.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/include/zlib.h b/ndk/build/platforms/android-3/arch-arm/usr/include/zlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/include/zlib.h rename to ndk/build/platforms/android-3/arch-arm/usr/include/zlib.h diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtbegin_dynamic.o b/ndk/build/platforms/android-3/arch-arm/usr/lib/crtbegin_dynamic.o similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtbegin_dynamic.o rename to ndk/build/platforms/android-3/arch-arm/usr/lib/crtbegin_dynamic.o diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtbegin_static.o b/ndk/build/platforms/android-3/arch-arm/usr/lib/crtbegin_static.o similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtbegin_static.o rename to ndk/build/platforms/android-3/arch-arm/usr/lib/crtbegin_static.o diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtend_android.o b/ndk/build/platforms/android-3/arch-arm/usr/lib/crtend_android.o similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/crtend_android.o rename to ndk/build/platforms/android-3/arch-arm/usr/lib/crtend_android.o diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libc.a b/ndk/build/platforms/android-3/arch-arm/usr/lib/libc.a similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libc.a rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libc.a diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libc.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libc.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libc.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libc.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libdl.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libdl.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libdl.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libdl.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/liblog.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/liblog.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/liblog.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/liblog.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libm.a b/ndk/build/platforms/android-3/arch-arm/usr/lib/libm.a similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libm.a rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libm.a diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libm.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libm.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libm.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libm.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libstdc++.a b/ndk/build/platforms/android-3/arch-arm/usr/lib/libstdc++.a similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libstdc++.a rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libstdc++.a diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libstdc++.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libstdc++.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libstdc++.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libstdc++.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libthread_db.a b/ndk/build/platforms/android-3/arch-arm/usr/lib/libthread_db.a similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libthread_db.a rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libthread_db.a diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libthread_db.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libthread_db.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libthread_db.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libthread_db.so diff --git a/ndk/build/platforms/android-1.5/arch-arm/usr/lib/libz.so b/ndk/build/platforms/android-3/arch-arm/usr/lib/libz.so similarity index 100% rename from ndk/build/platforms/android-1.5/arch-arm/usr/lib/libz.so rename to ndk/build/platforms/android-3/arch-arm/usr/lib/libz.so diff --git a/ndk/build/platforms/android-1.5/common/include/alloca.h b/ndk/build/platforms/android-3/common/include/alloca.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/alloca.h rename to ndk/build/platforms/android-3/common/include/alloca.h diff --git a/ndk/build/platforms/android-1.5/common/include/android/log.h b/ndk/build/platforms/android-3/common/include/android/log.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/android/log.h rename to ndk/build/platforms/android-3/common/include/android/log.h diff --git a/ndk/build/platforms/android-1.5/common/include/arpa/inet.h b/ndk/build/platforms/android-3/common/include/arpa/inet.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/arpa/inet.h rename to ndk/build/platforms/android-3/common/include/arpa/inet.h diff --git a/ndk/build/platforms/android-1.5/common/include/arpa/nameser.h b/ndk/build/platforms/android-3/common/include/arpa/nameser.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/arpa/nameser.h rename to ndk/build/platforms/android-3/common/include/arpa/nameser.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/4level-fixup.h b/ndk/build/platforms/android-3/common/include/asm-generic/4level-fixup.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/4level-fixup.h rename to ndk/build/platforms/android-3/common/include/asm-generic/4level-fixup.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/audit_dir_write.h b/ndk/build/platforms/android-3/common/include/asm-generic/audit_dir_write.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/audit_dir_write.h rename to ndk/build/platforms/android-3/common/include/asm-generic/audit_dir_write.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/__ffs.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/__ffs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/__ffs.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/__ffs.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/atomic.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/atomic.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/atomic.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/atomic.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/ffz.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/ffz.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/ffz.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/ffz.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/find.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/find.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/find.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/find.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/fls.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/fls.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/fls.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/fls.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/fls64.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/fls64.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/fls64.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/fls64.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/le.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/le.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/le.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/le.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/non-atomic.h b/ndk/build/platforms/android-3/common/include/asm-generic/bitops/non-atomic.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bitops/non-atomic.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bitops/non-atomic.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/bug.h b/ndk/build/platforms/android-3/common/include/asm-generic/bug.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/bug.h rename to ndk/build/platforms/android-3/common/include/asm-generic/bug.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/cputime.h b/ndk/build/platforms/android-3/common/include/asm-generic/cputime.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/cputime.h rename to ndk/build/platforms/android-3/common/include/asm-generic/cputime.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/emergency-restart.h b/ndk/build/platforms/android-3/common/include/asm-generic/emergency-restart.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/emergency-restart.h rename to ndk/build/platforms/android-3/common/include/asm-generic/emergency-restart.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/errno-base.h b/ndk/build/platforms/android-3/common/include/asm-generic/errno-base.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/errno-base.h rename to ndk/build/platforms/android-3/common/include/asm-generic/errno-base.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/errno.h b/ndk/build/platforms/android-3/common/include/asm-generic/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/errno.h rename to ndk/build/platforms/android-3/common/include/asm-generic/errno.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/fcntl.h b/ndk/build/platforms/android-3/common/include/asm-generic/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/fcntl.h rename to ndk/build/platforms/android-3/common/include/asm-generic/fcntl.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/futex.h b/ndk/build/platforms/android-3/common/include/asm-generic/futex.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/futex.h rename to ndk/build/platforms/android-3/common/include/asm-generic/futex.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/ioctl.h b/ndk/build/platforms/android-3/common/include/asm-generic/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/ioctl.h rename to ndk/build/platforms/android-3/common/include/asm-generic/ioctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/ipc.h b/ndk/build/platforms/android-3/common/include/asm-generic/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/ipc.h rename to ndk/build/platforms/android-3/common/include/asm-generic/ipc.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/local.h b/ndk/build/platforms/android-3/common/include/asm-generic/local.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/local.h rename to ndk/build/platforms/android-3/common/include/asm-generic/local.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/memory_model.h b/ndk/build/platforms/android-3/common/include/asm-generic/memory_model.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/memory_model.h rename to ndk/build/platforms/android-3/common/include/asm-generic/memory_model.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/mman.h b/ndk/build/platforms/android-3/common/include/asm-generic/mman.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/mman.h rename to ndk/build/platforms/android-3/common/include/asm-generic/mman.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/mutex-xchg.h b/ndk/build/platforms/android-3/common/include/asm-generic/mutex-xchg.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/mutex-xchg.h rename to ndk/build/platforms/android-3/common/include/asm-generic/mutex-xchg.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/percpu.h b/ndk/build/platforms/android-3/common/include/asm-generic/percpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/percpu.h rename to ndk/build/platforms/android-3/common/include/asm-generic/percpu.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/pgtable-nopud.h b/ndk/build/platforms/android-3/common/include/asm-generic/pgtable-nopud.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/pgtable-nopud.h rename to ndk/build/platforms/android-3/common/include/asm-generic/pgtable-nopud.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/pgtable.h b/ndk/build/platforms/android-3/common/include/asm-generic/pgtable.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/pgtable.h rename to ndk/build/platforms/android-3/common/include/asm-generic/pgtable.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/poll.h b/ndk/build/platforms/android-3/common/include/asm-generic/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/poll.h rename to ndk/build/platforms/android-3/common/include/asm-generic/poll.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/resource.h b/ndk/build/platforms/android-3/common/include/asm-generic/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/resource.h rename to ndk/build/platforms/android-3/common/include/asm-generic/resource.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/sections.h b/ndk/build/platforms/android-3/common/include/asm-generic/sections.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/sections.h rename to ndk/build/platforms/android-3/common/include/asm-generic/sections.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/siginfo.h b/ndk/build/platforms/android-3/common/include/asm-generic/siginfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/siginfo.h rename to ndk/build/platforms/android-3/common/include/asm-generic/siginfo.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/signal.h b/ndk/build/platforms/android-3/common/include/asm-generic/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/signal.h rename to ndk/build/platforms/android-3/common/include/asm-generic/signal.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/tlb.h b/ndk/build/platforms/android-3/common/include/asm-generic/tlb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/tlb.h rename to ndk/build/platforms/android-3/common/include/asm-generic/tlb.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/topology.h b/ndk/build/platforms/android-3/common/include/asm-generic/topology.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/topology.h rename to ndk/build/platforms/android-3/common/include/asm-generic/topology.h diff --git a/ndk/build/platforms/android-1.5/common/include/asm-generic/xor.h b/ndk/build/platforms/android-3/common/include/asm-generic/xor.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/asm-generic/xor.h rename to ndk/build/platforms/android-3/common/include/asm-generic/xor.h diff --git a/ndk/build/platforms/android-1.5/common/include/assert.h b/ndk/build/platforms/android-3/common/include/assert.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/assert.h rename to ndk/build/platforms/android-3/common/include/assert.h diff --git a/ndk/build/platforms/android-1.5/common/include/byteswap.h b/ndk/build/platforms/android-3/common/include/byteswap.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/byteswap.h rename to ndk/build/platforms/android-3/common/include/byteswap.h diff --git a/ndk/build/platforms/android-1.5/common/include/cstddef b/ndk/build/platforms/android-3/common/include/cstddef similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/cstddef rename to ndk/build/platforms/android-3/common/include/cstddef diff --git a/ndk/build/platforms/android-1.5/common/include/ctype.h b/ndk/build/platforms/android-3/common/include/ctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/ctype.h rename to ndk/build/platforms/android-3/common/include/ctype.h diff --git a/ndk/build/platforms/android-1.5/common/include/dirent.h b/ndk/build/platforms/android-3/common/include/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/dirent.h rename to ndk/build/platforms/android-3/common/include/dirent.h diff --git a/ndk/build/platforms/android-1.5/common/include/dlfcn.h b/ndk/build/platforms/android-3/common/include/dlfcn.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/dlfcn.h rename to ndk/build/platforms/android-3/common/include/dlfcn.h diff --git a/ndk/build/platforms/android-1.5/common/include/elf.h b/ndk/build/platforms/android-3/common/include/elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/elf.h rename to ndk/build/platforms/android-3/common/include/elf.h diff --git a/ndk/build/platforms/android-1.5/common/include/endian.h b/ndk/build/platforms/android-3/common/include/endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/endian.h rename to ndk/build/platforms/android-3/common/include/endian.h diff --git a/ndk/build/platforms/android-1.5/common/include/err.h b/ndk/build/platforms/android-3/common/include/err.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/err.h rename to ndk/build/platforms/android-3/common/include/err.h diff --git a/ndk/build/platforms/android-1.5/common/include/errno.h b/ndk/build/platforms/android-3/common/include/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/errno.h rename to ndk/build/platforms/android-3/common/include/errno.h diff --git a/ndk/build/platforms/android-1.5/common/include/fcntl.h b/ndk/build/platforms/android-3/common/include/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/fcntl.h rename to ndk/build/platforms/android-3/common/include/fcntl.h diff --git a/ndk/build/platforms/android-1.5/common/include/features.h b/ndk/build/platforms/android-3/common/include/features.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/features.h rename to ndk/build/platforms/android-3/common/include/features.h diff --git a/ndk/build/platforms/android-1.5/common/include/fnmatch.h b/ndk/build/platforms/android-3/common/include/fnmatch.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/fnmatch.h rename to ndk/build/platforms/android-3/common/include/fnmatch.h diff --git a/ndk/build/platforms/android-1.5/common/include/getopt.h b/ndk/build/platforms/android-3/common/include/getopt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/getopt.h rename to ndk/build/platforms/android-3/common/include/getopt.h diff --git a/ndk/build/platforms/android-1.5/common/include/grp.h b/ndk/build/platforms/android-3/common/include/grp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/grp.h rename to ndk/build/platforms/android-3/common/include/grp.h diff --git a/ndk/build/platforms/android-1.5/common/include/inttypes.h b/ndk/build/platforms/android-3/common/include/inttypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/inttypes.h rename to ndk/build/platforms/android-3/common/include/inttypes.h diff --git a/ndk/build/platforms/android-1.5/common/include/jni.h b/ndk/build/platforms/android-3/common/include/jni.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/jni.h rename to ndk/build/platforms/android-3/common/include/jni.h diff --git a/ndk/build/platforms/android-1.5/common/include/lastlog.h b/ndk/build/platforms/android-3/common/include/lastlog.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/lastlog.h rename to ndk/build/platforms/android-3/common/include/lastlog.h diff --git a/ndk/build/platforms/android-1.5/common/include/libgen.h b/ndk/build/platforms/android-3/common/include/libgen.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/libgen.h rename to ndk/build/platforms/android-3/common/include/libgen.h diff --git a/ndk/build/platforms/android-1.5/common/include/limits.h b/ndk/build/platforms/android-3/common/include/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/limits.h rename to ndk/build/platforms/android-3/common/include/limits.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/a.out.h b/ndk/build/platforms/android-3/common/include/linux/a.out.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/a.out.h rename to ndk/build/platforms/android-3/common/include/linux/a.out.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/aio_abi.h b/ndk/build/platforms/android-3/common/include/linux/aio_abi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/aio_abi.h rename to ndk/build/platforms/android-3/common/include/linux/aio_abi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/akm8976.h b/ndk/build/platforms/android-3/common/include/linux/akm8976.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/akm8976.h rename to ndk/build/platforms/android-3/common/include/linux/akm8976.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/android_alarm.h b/ndk/build/platforms/android-3/common/include/linux/android_alarm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/android_alarm.h rename to ndk/build/platforms/android-3/common/include/linux/android_alarm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/android_pmem.h b/ndk/build/platforms/android-3/common/include/linux/android_pmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/android_pmem.h rename to ndk/build/platforms/android-3/common/include/linux/android_pmem.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/android_power.h b/ndk/build/platforms/android-3/common/include/linux/android_power.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/android_power.h rename to ndk/build/platforms/android-3/common/include/linux/android_power.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/apm_bios.h b/ndk/build/platforms/android-3/common/include/linux/apm_bios.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/apm_bios.h rename to ndk/build/platforms/android-3/common/include/linux/apm_bios.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ashmem.h b/ndk/build/platforms/android-3/common/include/linux/ashmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ashmem.h rename to ndk/build/platforms/android-3/common/include/linux/ashmem.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ata.h b/ndk/build/platforms/android-3/common/include/linux/ata.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ata.h rename to ndk/build/platforms/android-3/common/include/linux/ata.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atm.h b/ndk/build/platforms/android-3/common/include/linux/atm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atm.h rename to ndk/build/platforms/android-3/common/include/linux/atm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atmapi.h b/ndk/build/platforms/android-3/common/include/linux/atmapi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atmapi.h rename to ndk/build/platforms/android-3/common/include/linux/atmapi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atmdev.h b/ndk/build/platforms/android-3/common/include/linux/atmdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atmdev.h rename to ndk/build/platforms/android-3/common/include/linux/atmdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atmioc.h b/ndk/build/platforms/android-3/common/include/linux/atmioc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atmioc.h rename to ndk/build/platforms/android-3/common/include/linux/atmioc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atmppp.h b/ndk/build/platforms/android-3/common/include/linux/atmppp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atmppp.h rename to ndk/build/platforms/android-3/common/include/linux/atmppp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/atmsap.h b/ndk/build/platforms/android-3/common/include/linux/atmsap.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/atmsap.h rename to ndk/build/platforms/android-3/common/include/linux/atmsap.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/attribute_container.h b/ndk/build/platforms/android-3/common/include/linux/attribute_container.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/attribute_container.h rename to ndk/build/platforms/android-3/common/include/linux/attribute_container.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/auto_fs.h b/ndk/build/platforms/android-3/common/include/linux/auto_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/auto_fs.h rename to ndk/build/platforms/android-3/common/include/linux/auto_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/autoconf.h b/ndk/build/platforms/android-3/common/include/linux/autoconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/autoconf.h rename to ndk/build/platforms/android-3/common/include/linux/autoconf.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/auxvec.h b/ndk/build/platforms/android-3/common/include/linux/auxvec.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/auxvec.h rename to ndk/build/platforms/android-3/common/include/linux/auxvec.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/backing-dev.h b/ndk/build/platforms/android-3/common/include/linux/backing-dev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/backing-dev.h rename to ndk/build/platforms/android-3/common/include/linux/backing-dev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/binder.h b/ndk/build/platforms/android-3/common/include/linux/binder.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/binder.h rename to ndk/build/platforms/android-3/common/include/linux/binder.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/binfmts.h b/ndk/build/platforms/android-3/common/include/linux/binfmts.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/binfmts.h rename to ndk/build/platforms/android-3/common/include/linux/binfmts.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/bio.h b/ndk/build/platforms/android-3/common/include/linux/bio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/bio.h rename to ndk/build/platforms/android-3/common/include/linux/bio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/bitmap.h b/ndk/build/platforms/android-3/common/include/linux/bitmap.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/bitmap.h rename to ndk/build/platforms/android-3/common/include/linux/bitmap.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/bitops.h b/ndk/build/platforms/android-3/common/include/linux/bitops.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/bitops.h rename to ndk/build/platforms/android-3/common/include/linux/bitops.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/blkdev.h b/ndk/build/platforms/android-3/common/include/linux/blkdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/blkdev.h rename to ndk/build/platforms/android-3/common/include/linux/blkdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/blkpg.h b/ndk/build/platforms/android-3/common/include/linux/blkpg.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/blkpg.h rename to ndk/build/platforms/android-3/common/include/linux/blkpg.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/blockgroup_lock.h b/ndk/build/platforms/android-3/common/include/linux/blockgroup_lock.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/blockgroup_lock.h rename to ndk/build/platforms/android-3/common/include/linux/blockgroup_lock.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/byteorder/big_endian.h b/ndk/build/platforms/android-3/common/include/linux/byteorder/big_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/byteorder/big_endian.h rename to ndk/build/platforms/android-3/common/include/linux/byteorder/big_endian.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/byteorder/generic.h b/ndk/build/platforms/android-3/common/include/linux/byteorder/generic.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/byteorder/generic.h rename to ndk/build/platforms/android-3/common/include/linux/byteorder/generic.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/byteorder/little_endian.h b/ndk/build/platforms/android-3/common/include/linux/byteorder/little_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/byteorder/little_endian.h rename to ndk/build/platforms/android-3/common/include/linux/byteorder/little_endian.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/byteorder/swab.h b/ndk/build/platforms/android-3/common/include/linux/byteorder/swab.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/byteorder/swab.h rename to ndk/build/platforms/android-3/common/include/linux/byteorder/swab.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/byteorder/swabb.h b/ndk/build/platforms/android-3/common/include/linux/byteorder/swabb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/byteorder/swabb.h rename to ndk/build/platforms/android-3/common/include/linux/byteorder/swabb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/cache.h b/ndk/build/platforms/android-3/common/include/linux/cache.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/cache.h rename to ndk/build/platforms/android-3/common/include/linux/cache.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/calc64.h b/ndk/build/platforms/android-3/common/include/linux/calc64.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/calc64.h rename to ndk/build/platforms/android-3/common/include/linux/calc64.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/capability.h b/ndk/build/platforms/android-3/common/include/linux/capability.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/capability.h rename to ndk/build/platforms/android-3/common/include/linux/capability.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/capi.h b/ndk/build/platforms/android-3/common/include/linux/capi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/capi.h rename to ndk/build/platforms/android-3/common/include/linux/capi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/cdev.h b/ndk/build/platforms/android-3/common/include/linux/cdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/cdev.h rename to ndk/build/platforms/android-3/common/include/linux/cdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/cdrom.h b/ndk/build/platforms/android-3/common/include/linux/cdrom.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/cdrom.h rename to ndk/build/platforms/android-3/common/include/linux/cdrom.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/circ_buf.h b/ndk/build/platforms/android-3/common/include/linux/circ_buf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/circ_buf.h rename to ndk/build/platforms/android-3/common/include/linux/circ_buf.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/clk.h b/ndk/build/platforms/android-3/common/include/linux/clk.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/clk.h rename to ndk/build/platforms/android-3/common/include/linux/clk.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/coda.h b/ndk/build/platforms/android-3/common/include/linux/coda.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/coda.h rename to ndk/build/platforms/android-3/common/include/linux/coda.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/coda_fs_i.h b/ndk/build/platforms/android-3/common/include/linux/coda_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/coda_fs_i.h rename to ndk/build/platforms/android-3/common/include/linux/coda_fs_i.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/compat.h b/ndk/build/platforms/android-3/common/include/linux/compat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/compat.h rename to ndk/build/platforms/android-3/common/include/linux/compat.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/compiler-gcc.h b/ndk/build/platforms/android-3/common/include/linux/compiler-gcc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/compiler-gcc.h rename to ndk/build/platforms/android-3/common/include/linux/compiler-gcc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/compiler.h b/ndk/build/platforms/android-3/common/include/linux/compiler.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/compiler.h rename to ndk/build/platforms/android-3/common/include/linux/compiler.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/completion.h b/ndk/build/platforms/android-3/common/include/linux/completion.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/completion.h rename to ndk/build/platforms/android-3/common/include/linux/completion.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/config.h b/ndk/build/platforms/android-3/common/include/linux/config.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/config.h rename to ndk/build/platforms/android-3/common/include/linux/config.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/console_struct.h b/ndk/build/platforms/android-3/common/include/linux/console_struct.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/console_struct.h rename to ndk/build/platforms/android-3/common/include/linux/console_struct.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/cpu.h b/ndk/build/platforms/android-3/common/include/linux/cpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/cpu.h rename to ndk/build/platforms/android-3/common/include/linux/cpu.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/cpumask.h b/ndk/build/platforms/android-3/common/include/linux/cpumask.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/cpumask.h rename to ndk/build/platforms/android-3/common/include/linux/cpumask.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ctype.h b/ndk/build/platforms/android-3/common/include/linux/ctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ctype.h rename to ndk/build/platforms/android-3/common/include/linux/ctype.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/dccp.h b/ndk/build/platforms/android-3/common/include/linux/dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/dccp.h rename to ndk/build/platforms/android-3/common/include/linux/dccp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/debug_locks.h b/ndk/build/platforms/android-3/common/include/linux/debug_locks.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/debug_locks.h rename to ndk/build/platforms/android-3/common/include/linux/debug_locks.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/delay.h b/ndk/build/platforms/android-3/common/include/linux/delay.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/delay.h rename to ndk/build/platforms/android-3/common/include/linux/delay.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/device.h b/ndk/build/platforms/android-3/common/include/linux/device.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/device.h rename to ndk/build/platforms/android-3/common/include/linux/device.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/dirent.h b/ndk/build/platforms/android-3/common/include/linux/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/dirent.h rename to ndk/build/platforms/android-3/common/include/linux/dirent.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/dm-ioctl.h b/ndk/build/platforms/android-3/common/include/linux/dm-ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/dm-ioctl.h rename to ndk/build/platforms/android-3/common/include/linux/dm-ioctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/dma-mapping.h b/ndk/build/platforms/android-3/common/include/linux/dma-mapping.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/dma-mapping.h rename to ndk/build/platforms/android-3/common/include/linux/dma-mapping.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/dmaengine.h b/ndk/build/platforms/android-3/common/include/linux/dmaengine.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/dmaengine.h rename to ndk/build/platforms/android-3/common/include/linux/dmaengine.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/efs_dir.h b/ndk/build/platforms/android-3/common/include/linux/efs_dir.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/efs_dir.h rename to ndk/build/platforms/android-3/common/include/linux/efs_dir.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/efs_fs_i.h b/ndk/build/platforms/android-3/common/include/linux/efs_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/efs_fs_i.h rename to ndk/build/platforms/android-3/common/include/linux/efs_fs_i.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/efs_fs_sb.h b/ndk/build/platforms/android-3/common/include/linux/efs_fs_sb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/efs_fs_sb.h rename to ndk/build/platforms/android-3/common/include/linux/efs_fs_sb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/elevator.h b/ndk/build/platforms/android-3/common/include/linux/elevator.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/elevator.h rename to ndk/build/platforms/android-3/common/include/linux/elevator.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/elf-em.h b/ndk/build/platforms/android-3/common/include/linux/elf-em.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/elf-em.h rename to ndk/build/platforms/android-3/common/include/linux/elf-em.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/elf.h b/ndk/build/platforms/android-3/common/include/linux/elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/elf.h rename to ndk/build/platforms/android-3/common/include/linux/elf.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/err.h b/ndk/build/platforms/android-3/common/include/linux/err.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/err.h rename to ndk/build/platforms/android-3/common/include/linux/err.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/errno.h b/ndk/build/platforms/android-3/common/include/linux/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/errno.h rename to ndk/build/platforms/android-3/common/include/linux/errno.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/errqueue.h b/ndk/build/platforms/android-3/common/include/linux/errqueue.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/errqueue.h rename to ndk/build/platforms/android-3/common/include/linux/errqueue.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/etherdevice.h b/ndk/build/platforms/android-3/common/include/linux/etherdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/etherdevice.h rename to ndk/build/platforms/android-3/common/include/linux/etherdevice.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ext2_fs.h b/ndk/build/platforms/android-3/common/include/linux/ext2_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ext2_fs.h rename to ndk/build/platforms/android-3/common/include/linux/ext2_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ext3_fs.h b/ndk/build/platforms/android-3/common/include/linux/ext3_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ext3_fs.h rename to ndk/build/platforms/android-3/common/include/linux/ext3_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/fadvise.h b/ndk/build/platforms/android-3/common/include/linux/fadvise.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/fadvise.h rename to ndk/build/platforms/android-3/common/include/linux/fadvise.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/fb.h b/ndk/build/platforms/android-3/common/include/linux/fb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/fb.h rename to ndk/build/platforms/android-3/common/include/linux/fb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/fcntl.h b/ndk/build/platforms/android-3/common/include/linux/fcntl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/fcntl.h rename to ndk/build/platforms/android-3/common/include/linux/fcntl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/fd.h b/ndk/build/platforms/android-3/common/include/linux/fd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/fd.h rename to ndk/build/platforms/android-3/common/include/linux/fd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/file.h b/ndk/build/platforms/android-3/common/include/linux/file.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/file.h rename to ndk/build/platforms/android-3/common/include/linux/file.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/filter.h b/ndk/build/platforms/android-3/common/include/linux/filter.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/filter.h rename to ndk/build/platforms/android-3/common/include/linux/filter.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/fs.h b/ndk/build/platforms/android-3/common/include/linux/fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/fs.h rename to ndk/build/platforms/android-3/common/include/linux/fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ftape.h b/ndk/build/platforms/android-3/common/include/linux/ftape.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ftape.h rename to ndk/build/platforms/android-3/common/include/linux/ftape.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/futex.h b/ndk/build/platforms/android-3/common/include/linux/futex.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/futex.h rename to ndk/build/platforms/android-3/common/include/linux/futex.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/genhd.h b/ndk/build/platforms/android-3/common/include/linux/genhd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/genhd.h rename to ndk/build/platforms/android-3/common/include/linux/genhd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/gfp.h b/ndk/build/platforms/android-3/common/include/linux/gfp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/gfp.h rename to ndk/build/platforms/android-3/common/include/linux/gfp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/hardirq.h b/ndk/build/platforms/android-3/common/include/linux/hardirq.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/hardirq.h rename to ndk/build/platforms/android-3/common/include/linux/hardirq.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/hdlc/ioctl.h b/ndk/build/platforms/android-3/common/include/linux/hdlc/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/hdlc/ioctl.h rename to ndk/build/platforms/android-3/common/include/linux/hdlc/ioctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/hdreg.h b/ndk/build/platforms/android-3/common/include/linux/hdreg.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/hdreg.h rename to ndk/build/platforms/android-3/common/include/linux/hdreg.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/hdsmart.h b/ndk/build/platforms/android-3/common/include/linux/hdsmart.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/hdsmart.h rename to ndk/build/platforms/android-3/common/include/linux/hdsmart.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/highmem.h b/ndk/build/platforms/android-3/common/include/linux/highmem.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/highmem.h rename to ndk/build/platforms/android-3/common/include/linux/highmem.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/hil.h b/ndk/build/platforms/android-3/common/include/linux/hil.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/hil.h rename to ndk/build/platforms/android-3/common/include/linux/hil.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/i2c.h b/ndk/build/platforms/android-3/common/include/linux/i2c.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/i2c.h rename to ndk/build/platforms/android-3/common/include/linux/i2c.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/icmp.h b/ndk/build/platforms/android-3/common/include/linux/icmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/icmp.h rename to ndk/build/platforms/android-3/common/include/linux/icmp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if.h b/ndk/build/platforms/android-3/common/include/linux/if.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if.h rename to ndk/build/platforms/android-3/common/include/linux/if.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_arcnet.h b/ndk/build/platforms/android-3/common/include/linux/if_arcnet.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_arcnet.h rename to ndk/build/platforms/android-3/common/include/linux/if_arcnet.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_arp.h b/ndk/build/platforms/android-3/common/include/linux/if_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_arp.h rename to ndk/build/platforms/android-3/common/include/linux/if_arp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_bridge.h b/ndk/build/platforms/android-3/common/include/linux/if_bridge.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_bridge.h rename to ndk/build/platforms/android-3/common/include/linux/if_bridge.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_ether.h b/ndk/build/platforms/android-3/common/include/linux/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_ether.h rename to ndk/build/platforms/android-3/common/include/linux/if_ether.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_fc.h b/ndk/build/platforms/android-3/common/include/linux/if_fc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_fc.h rename to ndk/build/platforms/android-3/common/include/linux/if_fc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_fddi.h b/ndk/build/platforms/android-3/common/include/linux/if_fddi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_fddi.h rename to ndk/build/platforms/android-3/common/include/linux/if_fddi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_hippi.h b/ndk/build/platforms/android-3/common/include/linux/if_hippi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_hippi.h rename to ndk/build/platforms/android-3/common/include/linux/if_hippi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_packet.h b/ndk/build/platforms/android-3/common/include/linux/if_packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_packet.h rename to ndk/build/platforms/android-3/common/include/linux/if_packet.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_ppp.h b/ndk/build/platforms/android-3/common/include/linux/if_ppp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_ppp.h rename to ndk/build/platforms/android-3/common/include/linux/if_ppp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_tr.h b/ndk/build/platforms/android-3/common/include/linux/if_tr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_tr.h rename to ndk/build/platforms/android-3/common/include/linux/if_tr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_tun.h b/ndk/build/platforms/android-3/common/include/linux/if_tun.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_tun.h rename to ndk/build/platforms/android-3/common/include/linux/if_tun.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/if_vlan.h b/ndk/build/platforms/android-3/common/include/linux/if_vlan.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/if_vlan.h rename to ndk/build/platforms/android-3/common/include/linux/if_vlan.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/in.h b/ndk/build/platforms/android-3/common/include/linux/in.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/in.h rename to ndk/build/platforms/android-3/common/include/linux/in.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/in6.h b/ndk/build/platforms/android-3/common/include/linux/in6.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/in6.h rename to ndk/build/platforms/android-3/common/include/linux/in6.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/init.h b/ndk/build/platforms/android-3/common/include/linux/init.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/init.h rename to ndk/build/platforms/android-3/common/include/linux/init.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/inotify.h b/ndk/build/platforms/android-3/common/include/linux/inotify.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/inotify.h rename to ndk/build/platforms/android-3/common/include/linux/inotify.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/input.h b/ndk/build/platforms/android-3/common/include/linux/input.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/input.h rename to ndk/build/platforms/android-3/common/include/linux/input.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/interrupt.h b/ndk/build/platforms/android-3/common/include/linux/interrupt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/interrupt.h rename to ndk/build/platforms/android-3/common/include/linux/interrupt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ioctl.h b/ndk/build/platforms/android-3/common/include/linux/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ioctl.h rename to ndk/build/platforms/android-3/common/include/linux/ioctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ioport.h b/ndk/build/platforms/android-3/common/include/linux/ioport.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ioport.h rename to ndk/build/platforms/android-3/common/include/linux/ioport.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ioprio.h b/ndk/build/platforms/android-3/common/include/linux/ioprio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ioprio.h rename to ndk/build/platforms/android-3/common/include/linux/ioprio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ip.h b/ndk/build/platforms/android-3/common/include/linux/ip.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ip.h rename to ndk/build/platforms/android-3/common/include/linux/ip.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ipc.h b/ndk/build/platforms/android-3/common/include/linux/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ipc.h rename to ndk/build/platforms/android-3/common/include/linux/ipc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ipmi_msgdefs.h b/ndk/build/platforms/android-3/common/include/linux/ipmi_msgdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ipmi_msgdefs.h rename to ndk/build/platforms/android-3/common/include/linux/ipmi_msgdefs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ipmi_smi.h b/ndk/build/platforms/android-3/common/include/linux/ipmi_smi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ipmi_smi.h rename to ndk/build/platforms/android-3/common/include/linux/ipmi_smi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ipx.h b/ndk/build/platforms/android-3/common/include/linux/ipx.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ipx.h rename to ndk/build/platforms/android-3/common/include/linux/ipx.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/irq.h b/ndk/build/platforms/android-3/common/include/linux/irq.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/irq.h rename to ndk/build/platforms/android-3/common/include/linux/irq.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/irq_cpustat.h b/ndk/build/platforms/android-3/common/include/linux/irq_cpustat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/irq_cpustat.h rename to ndk/build/platforms/android-3/common/include/linux/irq_cpustat.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/irqflags.h b/ndk/build/platforms/android-3/common/include/linux/irqflags.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/irqflags.h rename to ndk/build/platforms/android-3/common/include/linux/irqflags.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/irqreturn.h b/ndk/build/platforms/android-3/common/include/linux/irqreturn.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/irqreturn.h rename to ndk/build/platforms/android-3/common/include/linux/irqreturn.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/jbd.h b/ndk/build/platforms/android-3/common/include/linux/jbd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/jbd.h rename to ndk/build/platforms/android-3/common/include/linux/jbd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/jiffies.h b/ndk/build/platforms/android-3/common/include/linux/jiffies.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/jiffies.h rename to ndk/build/platforms/android-3/common/include/linux/jiffies.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kd.h b/ndk/build/platforms/android-3/common/include/linux/kd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kd.h rename to ndk/build/platforms/android-3/common/include/linux/kd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kdev_t.h b/ndk/build/platforms/android-3/common/include/linux/kdev_t.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kdev_t.h rename to ndk/build/platforms/android-3/common/include/linux/kdev_t.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kernel.h b/ndk/build/platforms/android-3/common/include/linux/kernel.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kernel.h rename to ndk/build/platforms/android-3/common/include/linux/kernel.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kernel_stat.h b/ndk/build/platforms/android-3/common/include/linux/kernel_stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kernel_stat.h rename to ndk/build/platforms/android-3/common/include/linux/kernel_stat.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kernelcapi.h b/ndk/build/platforms/android-3/common/include/linux/kernelcapi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kernelcapi.h rename to ndk/build/platforms/android-3/common/include/linux/kernelcapi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kexec.h b/ndk/build/platforms/android-3/common/include/linux/kexec.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kexec.h rename to ndk/build/platforms/android-3/common/include/linux/kexec.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/key.h b/ndk/build/platforms/android-3/common/include/linux/key.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/key.h rename to ndk/build/platforms/android-3/common/include/linux/key.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/keyboard.h b/ndk/build/platforms/android-3/common/include/linux/keyboard.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/keyboard.h rename to ndk/build/platforms/android-3/common/include/linux/keyboard.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/keychord.h b/ndk/build/platforms/android-3/common/include/linux/keychord.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/keychord.h rename to ndk/build/platforms/android-3/common/include/linux/keychord.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/klist.h b/ndk/build/platforms/android-3/common/include/linux/klist.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/klist.h rename to ndk/build/platforms/android-3/common/include/linux/klist.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kmod.h b/ndk/build/platforms/android-3/common/include/linux/kmod.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kmod.h rename to ndk/build/platforms/android-3/common/include/linux/kmod.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kobject.h b/ndk/build/platforms/android-3/common/include/linux/kobject.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kobject.h rename to ndk/build/platforms/android-3/common/include/linux/kobject.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/kref.h b/ndk/build/platforms/android-3/common/include/linux/kref.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/kref.h rename to ndk/build/platforms/android-3/common/include/linux/kref.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ktime.h b/ndk/build/platforms/android-3/common/include/linux/ktime.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ktime.h rename to ndk/build/platforms/android-3/common/include/linux/ktime.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/limits.h b/ndk/build/platforms/android-3/common/include/linux/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/limits.h rename to ndk/build/platforms/android-3/common/include/linux/limits.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/linkage.h b/ndk/build/platforms/android-3/common/include/linux/linkage.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/linkage.h rename to ndk/build/platforms/android-3/common/include/linux/linkage.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/list.h b/ndk/build/platforms/android-3/common/include/linux/list.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/list.h rename to ndk/build/platforms/android-3/common/include/linux/list.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/lockd/nlm.h b/ndk/build/platforms/android-3/common/include/linux/lockd/nlm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/lockd/nlm.h rename to ndk/build/platforms/android-3/common/include/linux/lockd/nlm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/lockd/xdr.h b/ndk/build/platforms/android-3/common/include/linux/lockd/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/lockd/xdr.h rename to ndk/build/platforms/android-3/common/include/linux/lockd/xdr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/lockdep.h b/ndk/build/platforms/android-3/common/include/linux/lockdep.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/lockdep.h rename to ndk/build/platforms/android-3/common/include/linux/lockdep.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/loop.h b/ndk/build/platforms/android-3/common/include/linux/loop.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/loop.h rename to ndk/build/platforms/android-3/common/include/linux/loop.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/magic.h b/ndk/build/platforms/android-3/common/include/linux/magic.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/magic.h rename to ndk/build/platforms/android-3/common/include/linux/magic.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/major.h b/ndk/build/platforms/android-3/common/include/linux/major.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/major.h rename to ndk/build/platforms/android-3/common/include/linux/major.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mc146818rtc.h b/ndk/build/platforms/android-3/common/include/linux/mc146818rtc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mc146818rtc.h rename to ndk/build/platforms/android-3/common/include/linux/mc146818rtc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mca.h b/ndk/build/platforms/android-3/common/include/linux/mca.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mca.h rename to ndk/build/platforms/android-3/common/include/linux/mca.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mempolicy.h b/ndk/build/platforms/android-3/common/include/linux/mempolicy.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mempolicy.h rename to ndk/build/platforms/android-3/common/include/linux/mempolicy.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mempool.h b/ndk/build/platforms/android-3/common/include/linux/mempool.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mempool.h rename to ndk/build/platforms/android-3/common/include/linux/mempool.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/miscdevice.h b/ndk/build/platforms/android-3/common/include/linux/miscdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/miscdevice.h rename to ndk/build/platforms/android-3/common/include/linux/miscdevice.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mm.h b/ndk/build/platforms/android-3/common/include/linux/mm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mm.h rename to ndk/build/platforms/android-3/common/include/linux/mm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mmc/card.h b/ndk/build/platforms/android-3/common/include/linux/mmc/card.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mmc/card.h rename to ndk/build/platforms/android-3/common/include/linux/mmc/card.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mmc/host.h b/ndk/build/platforms/android-3/common/include/linux/mmc/host.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mmc/host.h rename to ndk/build/platforms/android-3/common/include/linux/mmc/host.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mmc/mmc.h b/ndk/build/platforms/android-3/common/include/linux/mmc/mmc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mmc/mmc.h rename to ndk/build/platforms/android-3/common/include/linux/mmc/mmc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mmzone.h b/ndk/build/platforms/android-3/common/include/linux/mmzone.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mmzone.h rename to ndk/build/platforms/android-3/common/include/linux/mmzone.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mod_devicetable.h b/ndk/build/platforms/android-3/common/include/linux/mod_devicetable.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mod_devicetable.h rename to ndk/build/platforms/android-3/common/include/linux/mod_devicetable.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/module.h b/ndk/build/platforms/android-3/common/include/linux/module.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/module.h rename to ndk/build/platforms/android-3/common/include/linux/module.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/moduleparam.h b/ndk/build/platforms/android-3/common/include/linux/moduleparam.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/moduleparam.h rename to ndk/build/platforms/android-3/common/include/linux/moduleparam.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mount.h b/ndk/build/platforms/android-3/common/include/linux/mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mount.h rename to ndk/build/platforms/android-3/common/include/linux/mount.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/msdos_fs.h b/ndk/build/platforms/android-3/common/include/linux/msdos_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/msdos_fs.h rename to ndk/build/platforms/android-3/common/include/linux/msdos_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/msg.h b/ndk/build/platforms/android-3/common/include/linux/msg.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/msg.h rename to ndk/build/platforms/android-3/common/include/linux/msg.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/msm_adsp.h b/ndk/build/platforms/android-3/common/include/linux/msm_adsp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/msm_adsp.h rename to ndk/build/platforms/android-3/common/include/linux/msm_adsp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/msm_audio.h b/ndk/build/platforms/android-3/common/include/linux/msm_audio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/msm_audio.h rename to ndk/build/platforms/android-3/common/include/linux/msm_audio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/msm_mdp.h b/ndk/build/platforms/android-3/common/include/linux/msm_mdp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/msm_mdp.h rename to ndk/build/platforms/android-3/common/include/linux/msm_mdp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mt9t013.h b/ndk/build/platforms/android-3/common/include/linux/mt9t013.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mt9t013.h rename to ndk/build/platforms/android-3/common/include/linux/mt9t013.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/bbm.h b/ndk/build/platforms/android-3/common/include/linux/mtd/bbm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/bbm.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/bbm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/blktrans.h b/ndk/build/platforms/android-3/common/include/linux/mtd/blktrans.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/blktrans.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/blktrans.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/cfi.h b/ndk/build/platforms/android-3/common/include/linux/mtd/cfi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/cfi.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/cfi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/cfi_endian.h b/ndk/build/platforms/android-3/common/include/linux/mtd/cfi_endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/cfi_endian.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/cfi_endian.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/compatmac.h b/ndk/build/platforms/android-3/common/include/linux/mtd/compatmac.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/compatmac.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/compatmac.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/flashchip.h b/ndk/build/platforms/android-3/common/include/linux/mtd/flashchip.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/flashchip.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/flashchip.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/map.h b/ndk/build/platforms/android-3/common/include/linux/mtd/map.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/map.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/map.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/mtd.h b/ndk/build/platforms/android-3/common/include/linux/mtd/mtd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/mtd.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/mtd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/nand.h b/ndk/build/platforms/android-3/common/include/linux/mtd/nand.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/nand.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/nand.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/nand_ecc.h b/ndk/build/platforms/android-3/common/include/linux/mtd/nand_ecc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/nand_ecc.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/nand_ecc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/nftl.h b/ndk/build/platforms/android-3/common/include/linux/mtd/nftl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/nftl.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/nftl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/onenand_regs.h b/ndk/build/platforms/android-3/common/include/linux/mtd/onenand_regs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/onenand_regs.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/onenand_regs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtd/partitions.h b/ndk/build/platforms/android-3/common/include/linux/mtd/partitions.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtd/partitions.h rename to ndk/build/platforms/android-3/common/include/linux/mtd/partitions.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mtio.h b/ndk/build/platforms/android-3/common/include/linux/mtio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mtio.h rename to ndk/build/platforms/android-3/common/include/linux/mtio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mutex-debug.h b/ndk/build/platforms/android-3/common/include/linux/mutex-debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mutex-debug.h rename to ndk/build/platforms/android-3/common/include/linux/mutex-debug.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/mutex.h b/ndk/build/platforms/android-3/common/include/linux/mutex.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/mutex.h rename to ndk/build/platforms/android-3/common/include/linux/mutex.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ncp.h b/ndk/build/platforms/android-3/common/include/linux/ncp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ncp.h rename to ndk/build/platforms/android-3/common/include/linux/ncp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ncp_mount.h b/ndk/build/platforms/android-3/common/include/linux/ncp_mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ncp_mount.h rename to ndk/build/platforms/android-3/common/include/linux/ncp_mount.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ncp_no.h b/ndk/build/platforms/android-3/common/include/linux/ncp_no.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ncp_no.h rename to ndk/build/platforms/android-3/common/include/linux/ncp_no.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/net.h b/ndk/build/platforms/android-3/common/include/linux/net.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/net.h rename to ndk/build/platforms/android-3/common/include/linux/net.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netdevice.h b/ndk/build/platforms/android-3/common/include/linux/netdevice.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netdevice.h rename to ndk/build/platforms/android-3/common/include/linux/netdevice.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter.h b/ndk/build/platforms/android-3/common/include/linux/netfilter.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_common.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_common.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_common.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_common.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_ftp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_ftp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_ftp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_ftp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_sctp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_sctp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_sctp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_tcp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_tcp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_tcp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_tuple_common.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_tuple_common.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nf_conntrack_tuple_common.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nf_conntrack_tuple_common.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nfnetlink.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nfnetlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nfnetlink.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nfnetlink.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/nfnetlink_conntrack.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/nfnetlink_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/nfnetlink_conntrack.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/nfnetlink_conntrack.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/x_tables.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/x_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/x_tables.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/x_tables.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_CLASSIFY.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_CLASSIFY.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_CLASSIFY.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_CLASSIFY.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_CONNSECMARK.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_CONNSECMARK.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_CONNSECMARK.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_CONNSECMARK.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_NFQUEUE.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_NFQUEUE.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_NFQUEUE.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_NFQUEUE.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_SECMARK.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_SECMARK.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_SECMARK.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_SECMARK.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_comment.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_comment.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_comment.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_comment.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_connbytes.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_connbytes.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_connbytes.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_connbytes.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_conntrack.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_conntrack.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_conntrack.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_dccp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_dccp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_dccp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_esp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_esp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_esp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_helper.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_helper.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_helper.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_helper.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_length.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_length.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_length.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_limit.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_limit.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_limit.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_limit.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_mac.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_mac.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_mac.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_multiport.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_multiport.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_multiport.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_multiport.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_physdev.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_physdev.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_physdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_pkttype.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_pkttype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_pkttype.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_pkttype.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_quota.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_quota.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_quota.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_quota.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_realm.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_realm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_realm.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_realm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_sctp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_sctp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_sctp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_state.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_state.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_state.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_state.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_statistic.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_statistic.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_statistic.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_statistic.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_string.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_string.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_string.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_string.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_tcpmss.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_tcpmss.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_tcpmss.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_tcpmss.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_tcpudp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter/xt_tcpudp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter/xt_tcpudp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter/xt_tcpudp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_arp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_arp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_arp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_arp/arp_tables.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_arp/arp_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_arp/arp_tables.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_arp/arp_tables.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_bridge.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_bridge.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_bridge.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_bridge.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_conntrack.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_conntrack.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_conntrack.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_conntrack.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_conntrack_tuple.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_conntrack_tuple.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_conntrack_tuple.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_conntrack_tuple.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_nat.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_nat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_nat.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_nat.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_nat_rule.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_nat_rule.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_nat_rule.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_nat_rule.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_queue.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_queue.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_queue.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_queue.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_tables.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ip_tables.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ip_tables.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_CLASSIFY.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_CLASSIFY.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_CLASSIFY.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_CLASSIFY.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_DSCP.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_DSCP.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_DSCP.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_DSCP.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ECN.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ECN.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ECN.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ECN.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_LOG.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_LOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_LOG.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_LOG.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_NFQUEUE.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_NFQUEUE.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_NFQUEUE.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_NFQUEUE.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_REJECT.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_REJECT.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_REJECT.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_REJECT.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TCPMSS.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TCPMSS.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TCPMSS.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TCPMSS.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TOS.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TOS.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TOS.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TOS.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TTL.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TTL.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_TTL.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_TTL.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ULOG.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ULOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ULOG.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ULOG.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_addrtype.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_addrtype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_addrtype.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_addrtype.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ah.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ah.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_ah.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_ah.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_comment.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_comment.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_comment.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_comment.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_connbytes.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_connbytes.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_connbytes.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_connbytes.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_dccp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_dccp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_dccp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_dccp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_dscp_.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_dscp_.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_dscp_.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_dscp_.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_esp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_esp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_esp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_hashlimit.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_hashlimit.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_hashlimit.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_hashlimit.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_helper.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_helper.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_helper.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_helper.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_iprange.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_iprange.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_iprange.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_iprange.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_length.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_length.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_length.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_mac.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_mac.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_mac.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_owner.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_owner.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_owner.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_owner.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_physdev.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_physdev.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_physdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_pkttype.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_pkttype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_pkttype.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_pkttype.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_realm.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_realm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_realm.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_realm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_recent.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_recent.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_recent.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_recent.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_sctp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_sctp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_sctp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_sctp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_state.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_state.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_state.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_state.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_string.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_string.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_string.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_string.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_tos_.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_tos_.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv4/ipt_tos_.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv4/ipt_tos_.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6_tables.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6_tables.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6_tables.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6_tables.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_LOG.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_LOG.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_LOG.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_LOG.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_REJECT.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_REJECT.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_REJECT.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_REJECT.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_ah.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_ah.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_ah.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_ah.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_esp.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_esp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_esp.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_esp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_frag.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_frag.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_frag.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_frag.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_ipv6header.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_ipv6header.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_ipv6header.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_length.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_length.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_length.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_length.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_mac.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_mac.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_mac.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_mac.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_opts.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_opts.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_opts.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_opts.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_owner.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_owner.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_owner.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_owner.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_physdev.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_physdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_physdev.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_physdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_rt.h b/ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_rt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netfilter_ipv6/ip6t_rt.h rename to ndk/build/platforms/android-3/common/include/linux/netfilter_ipv6/ip6t_rt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/netlink.h b/ndk/build/platforms/android-3/common/include/linux/netlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/netlink.h rename to ndk/build/platforms/android-3/common/include/linux/netlink.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfs.h b/ndk/build/platforms/android-3/common/include/linux/nfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfs.h rename to ndk/build/platforms/android-3/common/include/linux/nfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfs2.h b/ndk/build/platforms/android-3/common/include/linux/nfs2.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfs2.h rename to ndk/build/platforms/android-3/common/include/linux/nfs2.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfs3.h b/ndk/build/platforms/android-3/common/include/linux/nfs3.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfs3.h rename to ndk/build/platforms/android-3/common/include/linux/nfs3.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfs4.h b/ndk/build/platforms/android-3/common/include/linux/nfs4.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfs4.h rename to ndk/build/platforms/android-3/common/include/linux/nfs4.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfs_xdr.h b/ndk/build/platforms/android-3/common/include/linux/nfs_xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfs_xdr.h rename to ndk/build/platforms/android-3/common/include/linux/nfs_xdr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsacl.h b/ndk/build/platforms/android-3/common/include/linux/nfsacl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsacl.h rename to ndk/build/platforms/android-3/common/include/linux/nfsacl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/auth.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/auth.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/auth.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/auth.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/const.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/const.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/const.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/const.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/debug.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/debug.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/debug.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/export.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/export.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/export.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/export.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/interface.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/interface.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/interface.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/interface.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/nfsfh.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/nfsfh.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/nfsfh.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/nfsfh.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/stats.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/stats.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/stats.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/stats.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nfsd/xdr.h b/ndk/build/platforms/android-3/common/include/linux/nfsd/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nfsd/xdr.h rename to ndk/build/platforms/android-3/common/include/linux/nfsd/xdr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/node.h b/ndk/build/platforms/android-3/common/include/linux/node.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/node.h rename to ndk/build/platforms/android-3/common/include/linux/node.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nodemask.h b/ndk/build/platforms/android-3/common/include/linux/nodemask.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nodemask.h rename to ndk/build/platforms/android-3/common/include/linux/nodemask.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/notifier.h b/ndk/build/platforms/android-3/common/include/linux/notifier.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/notifier.h rename to ndk/build/platforms/android-3/common/include/linux/notifier.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/numa.h b/ndk/build/platforms/android-3/common/include/linux/numa.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/numa.h rename to ndk/build/platforms/android-3/common/include/linux/numa.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/nvram.h b/ndk/build/platforms/android-3/common/include/linux/nvram.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/nvram.h rename to ndk/build/platforms/android-3/common/include/linux/nvram.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/omap_csmi.h b/ndk/build/platforms/android-3/common/include/linux/omap_csmi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/omap_csmi.h rename to ndk/build/platforms/android-3/common/include/linux/omap_csmi.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pagemap.h b/ndk/build/platforms/android-3/common/include/linux/pagemap.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pagemap.h rename to ndk/build/platforms/android-3/common/include/linux/pagemap.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/param.h b/ndk/build/platforms/android-3/common/include/linux/param.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/param.h rename to ndk/build/platforms/android-3/common/include/linux/param.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/patchkey.h b/ndk/build/platforms/android-3/common/include/linux/patchkey.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/patchkey.h rename to ndk/build/platforms/android-3/common/include/linux/patchkey.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pci.h b/ndk/build/platforms/android-3/common/include/linux/pci.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pci.h rename to ndk/build/platforms/android-3/common/include/linux/pci.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pci_ids.h b/ndk/build/platforms/android-3/common/include/linux/pci_ids.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pci_ids.h rename to ndk/build/platforms/android-3/common/include/linux/pci_ids.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pci_regs.h b/ndk/build/platforms/android-3/common/include/linux/pci_regs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pci_regs.h rename to ndk/build/platforms/android-3/common/include/linux/pci_regs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/percpu.h b/ndk/build/platforms/android-3/common/include/linux/percpu.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/percpu.h rename to ndk/build/platforms/android-3/common/include/linux/percpu.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/percpu_counter.h b/ndk/build/platforms/android-3/common/include/linux/percpu_counter.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/percpu_counter.h rename to ndk/build/platforms/android-3/common/include/linux/percpu_counter.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/personality.h b/ndk/build/platforms/android-3/common/include/linux/personality.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/personality.h rename to ndk/build/platforms/android-3/common/include/linux/personality.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pfkeyv2.h b/ndk/build/platforms/android-3/common/include/linux/pfkeyv2.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pfkeyv2.h rename to ndk/build/platforms/android-3/common/include/linux/pfkeyv2.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pkt_cls.h b/ndk/build/platforms/android-3/common/include/linux/pkt_cls.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pkt_cls.h rename to ndk/build/platforms/android-3/common/include/linux/pkt_cls.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pkt_sched.h b/ndk/build/platforms/android-3/common/include/linux/pkt_sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pkt_sched.h rename to ndk/build/platforms/android-3/common/include/linux/pkt_sched.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/platform_device.h b/ndk/build/platforms/android-3/common/include/linux/platform_device.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/platform_device.h rename to ndk/build/platforms/android-3/common/include/linux/platform_device.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/plist.h b/ndk/build/platforms/android-3/common/include/linux/plist.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/plist.h rename to ndk/build/platforms/android-3/common/include/linux/plist.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pm.h b/ndk/build/platforms/android-3/common/include/linux/pm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pm.h rename to ndk/build/platforms/android-3/common/include/linux/pm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/pnp.h b/ndk/build/platforms/android-3/common/include/linux/pnp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/pnp.h rename to ndk/build/platforms/android-3/common/include/linux/pnp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/poll.h b/ndk/build/platforms/android-3/common/include/linux/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/poll.h rename to ndk/build/platforms/android-3/common/include/linux/poll.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/posix_acl.h b/ndk/build/platforms/android-3/common/include/linux/posix_acl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/posix_acl.h rename to ndk/build/platforms/android-3/common/include/linux/posix_acl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/posix_types.h b/ndk/build/platforms/android-3/common/include/linux/posix_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/posix_types.h rename to ndk/build/platforms/android-3/common/include/linux/posix_types.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ppdev.h b/ndk/build/platforms/android-3/common/include/linux/ppdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ppdev.h rename to ndk/build/platforms/android-3/common/include/linux/ppdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ppp_defs.h b/ndk/build/platforms/android-3/common/include/linux/ppp_defs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ppp_defs.h rename to ndk/build/platforms/android-3/common/include/linux/ppp_defs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/prctl.h b/ndk/build/platforms/android-3/common/include/linux/prctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/prctl.h rename to ndk/build/platforms/android-3/common/include/linux/prctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/preempt.h b/ndk/build/platforms/android-3/common/include/linux/preempt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/preempt.h rename to ndk/build/platforms/android-3/common/include/linux/preempt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/proc_fs.h b/ndk/build/platforms/android-3/common/include/linux/proc_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/proc_fs.h rename to ndk/build/platforms/android-3/common/include/linux/proc_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ptrace.h b/ndk/build/platforms/android-3/common/include/linux/ptrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ptrace.h rename to ndk/build/platforms/android-3/common/include/linux/ptrace.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/qic117.h b/ndk/build/platforms/android-3/common/include/linux/qic117.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/qic117.h rename to ndk/build/platforms/android-3/common/include/linux/qic117.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/qnxtypes.h b/ndk/build/platforms/android-3/common/include/linux/qnxtypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/qnxtypes.h rename to ndk/build/platforms/android-3/common/include/linux/qnxtypes.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/quota.h b/ndk/build/platforms/android-3/common/include/linux/quota.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/quota.h rename to ndk/build/platforms/android-3/common/include/linux/quota.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/raid/md.h b/ndk/build/platforms/android-3/common/include/linux/raid/md.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/raid/md.h rename to ndk/build/platforms/android-3/common/include/linux/raid/md.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/raid/md_k.h b/ndk/build/platforms/android-3/common/include/linux/raid/md_k.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/raid/md_k.h rename to ndk/build/platforms/android-3/common/include/linux/raid/md_k.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/raid/md_p.h b/ndk/build/platforms/android-3/common/include/linux/raid/md_p.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/raid/md_p.h rename to ndk/build/platforms/android-3/common/include/linux/raid/md_p.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/raid/md_u.h b/ndk/build/platforms/android-3/common/include/linux/raid/md_u.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/raid/md_u.h rename to ndk/build/platforms/android-3/common/include/linux/raid/md_u.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/raid/xor.h b/ndk/build/platforms/android-3/common/include/linux/raid/xor.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/raid/xor.h rename to ndk/build/platforms/android-3/common/include/linux/raid/xor.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/random.h b/ndk/build/platforms/android-3/common/include/linux/random.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/random.h rename to ndk/build/platforms/android-3/common/include/linux/random.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/rbtree.h b/ndk/build/platforms/android-3/common/include/linux/rbtree.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/rbtree.h rename to ndk/build/platforms/android-3/common/include/linux/rbtree.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/rcupdate.h b/ndk/build/platforms/android-3/common/include/linux/rcupdate.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/rcupdate.h rename to ndk/build/platforms/android-3/common/include/linux/rcupdate.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/reboot.h b/ndk/build/platforms/android-3/common/include/linux/reboot.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/reboot.h rename to ndk/build/platforms/android-3/common/include/linux/reboot.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/relay.h b/ndk/build/platforms/android-3/common/include/linux/relay.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/relay.h rename to ndk/build/platforms/android-3/common/include/linux/relay.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/resource.h b/ndk/build/platforms/android-3/common/include/linux/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/resource.h rename to ndk/build/platforms/android-3/common/include/linux/resource.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/route.h b/ndk/build/platforms/android-3/common/include/linux/route.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/route.h rename to ndk/build/platforms/android-3/common/include/linux/route.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/rtc.h b/ndk/build/platforms/android-3/common/include/linux/rtc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/rtc.h rename to ndk/build/platforms/android-3/common/include/linux/rtc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/rtnetlink.h b/ndk/build/platforms/android-3/common/include/linux/rtnetlink.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/rtnetlink.h rename to ndk/build/platforms/android-3/common/include/linux/rtnetlink.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/rwsem.h b/ndk/build/platforms/android-3/common/include/linux/rwsem.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/rwsem.h rename to ndk/build/platforms/android-3/common/include/linux/rwsem.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sched.h b/ndk/build/platforms/android-3/common/include/linux/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sched.h rename to ndk/build/platforms/android-3/common/include/linux/sched.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sem.h b/ndk/build/platforms/android-3/common/include/linux/sem.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sem.h rename to ndk/build/platforms/android-3/common/include/linux/sem.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/seq_file.h b/ndk/build/platforms/android-3/common/include/linux/seq_file.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/seq_file.h rename to ndk/build/platforms/android-3/common/include/linux/seq_file.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/seqlock.h b/ndk/build/platforms/android-3/common/include/linux/seqlock.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/seqlock.h rename to ndk/build/platforms/android-3/common/include/linux/seqlock.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/serial_core.h b/ndk/build/platforms/android-3/common/include/linux/serial_core.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/serial_core.h rename to ndk/build/platforms/android-3/common/include/linux/serial_core.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/serial_reg.h b/ndk/build/platforms/android-3/common/include/linux/serial_reg.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/serial_reg.h rename to ndk/build/platforms/android-3/common/include/linux/serial_reg.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/serio.h b/ndk/build/platforms/android-3/common/include/linux/serio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/serio.h rename to ndk/build/platforms/android-3/common/include/linux/serio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/shm.h b/ndk/build/platforms/android-3/common/include/linux/shm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/shm.h rename to ndk/build/platforms/android-3/common/include/linux/shm.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/signal.h b/ndk/build/platforms/android-3/common/include/linux/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/signal.h rename to ndk/build/platforms/android-3/common/include/linux/signal.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/skbuff.h b/ndk/build/platforms/android-3/common/include/linux/skbuff.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/skbuff.h rename to ndk/build/platforms/android-3/common/include/linux/skbuff.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/slab.h b/ndk/build/platforms/android-3/common/include/linux/slab.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/slab.h rename to ndk/build/platforms/android-3/common/include/linux/slab.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/smb.h b/ndk/build/platforms/android-3/common/include/linux/smb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/smb.h rename to ndk/build/platforms/android-3/common/include/linux/smb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/smp.h b/ndk/build/platforms/android-3/common/include/linux/smp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/smp.h rename to ndk/build/platforms/android-3/common/include/linux/smp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/smp_lock.h b/ndk/build/platforms/android-3/common/include/linux/smp_lock.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/smp_lock.h rename to ndk/build/platforms/android-3/common/include/linux/smp_lock.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/socket.h b/ndk/build/platforms/android-3/common/include/linux/socket.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/socket.h rename to ndk/build/platforms/android-3/common/include/linux/socket.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sockios.h b/ndk/build/platforms/android-3/common/include/linux/sockios.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sockios.h rename to ndk/build/platforms/android-3/common/include/linux/sockios.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/soundcard.h b/ndk/build/platforms/android-3/common/include/linux/soundcard.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/soundcard.h rename to ndk/build/platforms/android-3/common/include/linux/soundcard.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock.h b/ndk/build/platforms/android-3/common/include/linux/spinlock.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock_api_smp.h b/ndk/build/platforms/android-3/common/include/linux/spinlock_api_smp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock_api_smp.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock_api_smp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock_api_up.h b/ndk/build/platforms/android-3/common/include/linux/spinlock_api_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock_api_up.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock_api_up.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock_types.h b/ndk/build/platforms/android-3/common/include/linux/spinlock_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock_types.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock_types.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock_types_up.h b/ndk/build/platforms/android-3/common/include/linux/spinlock_types_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock_types_up.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock_types_up.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/spinlock_up.h b/ndk/build/platforms/android-3/common/include/linux/spinlock_up.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/spinlock_up.h rename to ndk/build/platforms/android-3/common/include/linux/spinlock_up.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/stacktrace.h b/ndk/build/platforms/android-3/common/include/linux/stacktrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/stacktrace.h rename to ndk/build/platforms/android-3/common/include/linux/stacktrace.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/stat.h b/ndk/build/platforms/android-3/common/include/linux/stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/stat.h rename to ndk/build/platforms/android-3/common/include/linux/stat.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/statfs.h b/ndk/build/platforms/android-3/common/include/linux/statfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/statfs.h rename to ndk/build/platforms/android-3/common/include/linux/statfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/stddef.h b/ndk/build/platforms/android-3/common/include/linux/stddef.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/stddef.h rename to ndk/build/platforms/android-3/common/include/linux/stddef.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/string.h b/ndk/build/platforms/android-3/common/include/linux/string.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/string.h rename to ndk/build/platforms/android-3/common/include/linux/string.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/stringify.h b/ndk/build/platforms/android-3/common/include/linux/stringify.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/stringify.h rename to ndk/build/platforms/android-3/common/include/linux/stringify.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/auth.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/auth.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/auth.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/auth.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/auth_gss.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/auth_gss.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/auth_gss.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/auth_gss.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/clnt.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/clnt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/clnt.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/clnt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/debug.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/debug.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/debug.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/debug.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_api.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_api.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_api.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_api.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_asn1.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_asn1.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_asn1.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_asn1.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_err.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_err.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/gss_err.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/gss_err.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/msg_prot.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/msg_prot.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/msg_prot.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/msg_prot.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/sched.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/sched.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/sched.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/stats.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/stats.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/stats.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/stats.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/svc.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/svc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/svc.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/svc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/svcauth.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/svcauth.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/svcauth.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/svcauth.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/timer.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/timer.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/timer.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/timer.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/types.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/types.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/types.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/xdr.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/xdr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/xdr.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/xdr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sunrpc/xprt.h b/ndk/build/platforms/android-3/common/include/linux/sunrpc/xprt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sunrpc/xprt.h rename to ndk/build/platforms/android-3/common/include/linux/sunrpc/xprt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/swap.h b/ndk/build/platforms/android-3/common/include/linux/swap.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/swap.h rename to ndk/build/platforms/android-3/common/include/linux/swap.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sysctl.h b/ndk/build/platforms/android-3/common/include/linux/sysctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sysctl.h rename to ndk/build/platforms/android-3/common/include/linux/sysctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sysdev.h b/ndk/build/platforms/android-3/common/include/linux/sysdev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sysdev.h rename to ndk/build/platforms/android-3/common/include/linux/sysdev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/sysfs.h b/ndk/build/platforms/android-3/common/include/linux/sysfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/sysfs.h rename to ndk/build/platforms/android-3/common/include/linux/sysfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/taskstats.h b/ndk/build/platforms/android-3/common/include/linux/taskstats.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/taskstats.h rename to ndk/build/platforms/android-3/common/include/linux/taskstats.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/taskstats_kern.h b/ndk/build/platforms/android-3/common/include/linux/taskstats_kern.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/taskstats_kern.h rename to ndk/build/platforms/android-3/common/include/linux/taskstats_kern.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/tcp.h b/ndk/build/platforms/android-3/common/include/linux/tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/tcp.h rename to ndk/build/platforms/android-3/common/include/linux/tcp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/telephony.h b/ndk/build/platforms/android-3/common/include/linux/telephony.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/telephony.h rename to ndk/build/platforms/android-3/common/include/linux/telephony.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/termios.h b/ndk/build/platforms/android-3/common/include/linux/termios.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/termios.h rename to ndk/build/platforms/android-3/common/include/linux/termios.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/textsearch.h b/ndk/build/platforms/android-3/common/include/linux/textsearch.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/textsearch.h rename to ndk/build/platforms/android-3/common/include/linux/textsearch.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/thread_info.h b/ndk/build/platforms/android-3/common/include/linux/thread_info.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/thread_info.h rename to ndk/build/platforms/android-3/common/include/linux/thread_info.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/threads.h b/ndk/build/platforms/android-3/common/include/linux/threads.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/threads.h rename to ndk/build/platforms/android-3/common/include/linux/threads.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/time.h b/ndk/build/platforms/android-3/common/include/linux/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/time.h rename to ndk/build/platforms/android-3/common/include/linux/time.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/timer.h b/ndk/build/platforms/android-3/common/include/linux/timer.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/timer.h rename to ndk/build/platforms/android-3/common/include/linux/timer.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/times.h b/ndk/build/platforms/android-3/common/include/linux/times.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/times.h rename to ndk/build/platforms/android-3/common/include/linux/times.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/timex.h b/ndk/build/platforms/android-3/common/include/linux/timex.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/timex.h rename to ndk/build/platforms/android-3/common/include/linux/timex.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/tiocl.h b/ndk/build/platforms/android-3/common/include/linux/tiocl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/tiocl.h rename to ndk/build/platforms/android-3/common/include/linux/tiocl.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/transport_class.h b/ndk/build/platforms/android-3/common/include/linux/transport_class.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/transport_class.h rename to ndk/build/platforms/android-3/common/include/linux/transport_class.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/tty.h b/ndk/build/platforms/android-3/common/include/linux/tty.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/tty.h rename to ndk/build/platforms/android-3/common/include/linux/tty.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/types.h b/ndk/build/platforms/android-3/common/include/linux/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/types.h rename to ndk/build/platforms/android-3/common/include/linux/types.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/udp.h b/ndk/build/platforms/android-3/common/include/linux/udp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/udp.h rename to ndk/build/platforms/android-3/common/include/linux/udp.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ufs_fs_i.h b/ndk/build/platforms/android-3/common/include/linux/ufs_fs_i.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ufs_fs_i.h rename to ndk/build/platforms/android-3/common/include/linux/ufs_fs_i.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/ufs_fs_sb.h b/ndk/build/platforms/android-3/common/include/linux/ufs_fs_sb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/ufs_fs_sb.h rename to ndk/build/platforms/android-3/common/include/linux/ufs_fs_sb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/uio.h b/ndk/build/platforms/android-3/common/include/linux/uio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/uio.h rename to ndk/build/platforms/android-3/common/include/linux/uio.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/un.h b/ndk/build/platforms/android-3/common/include/linux/un.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/un.h rename to ndk/build/platforms/android-3/common/include/linux/un.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/unistd.h b/ndk/build/platforms/android-3/common/include/linux/unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/unistd.h rename to ndk/build/platforms/android-3/common/include/linux/unistd.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/usb.h b/ndk/build/platforms/android-3/common/include/linux/usb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/usb.h rename to ndk/build/platforms/android-3/common/include/linux/usb.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/usb_ch9.h b/ndk/build/platforms/android-3/common/include/linux/usb_ch9.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/usb_ch9.h rename to ndk/build/platforms/android-3/common/include/linux/usb_ch9.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/usbdevice_fs.h b/ndk/build/platforms/android-3/common/include/linux/usbdevice_fs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/usbdevice_fs.h rename to ndk/build/platforms/android-3/common/include/linux/usbdevice_fs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/user.h b/ndk/build/platforms/android-3/common/include/linux/user.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/user.h rename to ndk/build/platforms/android-3/common/include/linux/user.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/utime.h b/ndk/build/platforms/android-3/common/include/linux/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/utime.h rename to ndk/build/platforms/android-3/common/include/linux/utime.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/utsname.h b/ndk/build/platforms/android-3/common/include/linux/utsname.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/utsname.h rename to ndk/build/platforms/android-3/common/include/linux/utsname.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/version.h b/ndk/build/platforms/android-3/common/include/linux/version.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/version.h rename to ndk/build/platforms/android-3/common/include/linux/version.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/vfs.h b/ndk/build/platforms/android-3/common/include/linux/vfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/vfs.h rename to ndk/build/platforms/android-3/common/include/linux/vfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/videodev.h b/ndk/build/platforms/android-3/common/include/linux/videodev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/videodev.h rename to ndk/build/platforms/android-3/common/include/linux/videodev.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/videodev2.h b/ndk/build/platforms/android-3/common/include/linux/videodev2.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/videodev2.h rename to ndk/build/platforms/android-3/common/include/linux/videodev2.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/vmalloc.h b/ndk/build/platforms/android-3/common/include/linux/vmalloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/vmalloc.h rename to ndk/build/platforms/android-3/common/include/linux/vmalloc.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/vt.h b/ndk/build/platforms/android-3/common/include/linux/vt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/vt.h rename to ndk/build/platforms/android-3/common/include/linux/vt.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/vt_buffer.h b/ndk/build/platforms/android-3/common/include/linux/vt_buffer.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/vt_buffer.h rename to ndk/build/platforms/android-3/common/include/linux/vt_buffer.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/wait.h b/ndk/build/platforms/android-3/common/include/linux/wait.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/wait.h rename to ndk/build/platforms/android-3/common/include/linux/wait.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/wanrouter.h b/ndk/build/platforms/android-3/common/include/linux/wanrouter.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/wanrouter.h rename to ndk/build/platforms/android-3/common/include/linux/wanrouter.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/wireless.h b/ndk/build/platforms/android-3/common/include/linux/wireless.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/wireless.h rename to ndk/build/platforms/android-3/common/include/linux/wireless.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/workqueue.h b/ndk/build/platforms/android-3/common/include/linux/workqueue.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/workqueue.h rename to ndk/build/platforms/android-3/common/include/linux/workqueue.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/xattr.h b/ndk/build/platforms/android-3/common/include/linux/xattr.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/xattr.h rename to ndk/build/platforms/android-3/common/include/linux/xattr.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/zconf.h b/ndk/build/platforms/android-3/common/include/linux/zconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/zconf.h rename to ndk/build/platforms/android-3/common/include/linux/zconf.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/zlib.h b/ndk/build/platforms/android-3/common/include/linux/zlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/zlib.h rename to ndk/build/platforms/android-3/common/include/linux/zlib.h diff --git a/ndk/build/platforms/android-1.5/common/include/linux/zorro_ids.h b/ndk/build/platforms/android-3/common/include/linux/zorro_ids.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/linux/zorro_ids.h rename to ndk/build/platforms/android-3/common/include/linux/zorro_ids.h diff --git a/ndk/build/platforms/android-1.5/common/include/locale.h b/ndk/build/platforms/android-3/common/include/locale.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/locale.h rename to ndk/build/platforms/android-3/common/include/locale.h diff --git a/ndk/build/platforms/android-1.5/common/include/malloc.h b/ndk/build/platforms/android-3/common/include/malloc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/malloc.h rename to ndk/build/platforms/android-3/common/include/malloc.h diff --git a/ndk/build/platforms/android-1.5/common/include/math.h b/ndk/build/platforms/android-3/common/include/math.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/math.h rename to ndk/build/platforms/android-3/common/include/math.h diff --git a/ndk/build/platforms/android-1.5/common/include/memory.h b/ndk/build/platforms/android-3/common/include/memory.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/memory.h rename to ndk/build/platforms/android-3/common/include/memory.h diff --git a/ndk/build/platforms/android-1.5/common/include/mntent.h b/ndk/build/platforms/android-3/common/include/mntent.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/mntent.h rename to ndk/build/platforms/android-3/common/include/mntent.h diff --git a/ndk/build/platforms/android-1.5/common/include/mtd/mtd-abi.h b/ndk/build/platforms/android-3/common/include/mtd/mtd-abi.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/mtd/mtd-abi.h rename to ndk/build/platforms/android-3/common/include/mtd/mtd-abi.h diff --git a/ndk/build/platforms/android-1.5/common/include/mtd/mtd-user.h b/ndk/build/platforms/android-3/common/include/mtd/mtd-user.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/mtd/mtd-user.h rename to ndk/build/platforms/android-3/common/include/mtd/mtd-user.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/ethertypes.h b/ndk/build/platforms/android-3/common/include/net/ethertypes.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/ethertypes.h rename to ndk/build/platforms/android-3/common/include/net/ethertypes.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if.h b/ndk/build/platforms/android-3/common/include/net/if.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if.h rename to ndk/build/platforms/android-3/common/include/net/if.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_arp.h b/ndk/build/platforms/android-3/common/include/net/if_arp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_arp.h rename to ndk/build/platforms/android-3/common/include/net/if_arp.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_dl.h b/ndk/build/platforms/android-3/common/include/net/if_dl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_dl.h rename to ndk/build/platforms/android-3/common/include/net/if_dl.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_ether.h b/ndk/build/platforms/android-3/common/include/net/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_ether.h rename to ndk/build/platforms/android-3/common/include/net/if_ether.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_ieee1394.h b/ndk/build/platforms/android-3/common/include/net/if_ieee1394.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_ieee1394.h rename to ndk/build/platforms/android-3/common/include/net/if_ieee1394.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_packet.h b/ndk/build/platforms/android-3/common/include/net/if_packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_packet.h rename to ndk/build/platforms/android-3/common/include/net/if_packet.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/if_types.h b/ndk/build/platforms/android-3/common/include/net/if_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/if_types.h rename to ndk/build/platforms/android-3/common/include/net/if_types.h diff --git a/ndk/build/platforms/android-1.5/common/include/net/route.h b/ndk/build/platforms/android-3/common/include/net/route.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/net/route.h rename to ndk/build/platforms/android-3/common/include/net/route.h diff --git a/ndk/build/platforms/android-1.5/common/include/netdb.h b/ndk/build/platforms/android-3/common/include/netdb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netdb.h rename to ndk/build/platforms/android-3/common/include/netdb.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/ether.h b/ndk/build/platforms/android-3/common/include/netinet/ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/ether.h rename to ndk/build/platforms/android-3/common/include/netinet/ether.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/if_ether.h b/ndk/build/platforms/android-3/common/include/netinet/if_ether.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/if_ether.h rename to ndk/build/platforms/android-3/common/include/netinet/if_ether.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/in.h b/ndk/build/platforms/android-3/common/include/netinet/in.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/in.h rename to ndk/build/platforms/android-3/common/include/netinet/in.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/in6.h b/ndk/build/platforms/android-3/common/include/netinet/in6.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/in6.h rename to ndk/build/platforms/android-3/common/include/netinet/in6.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/in_systm.h b/ndk/build/platforms/android-3/common/include/netinet/in_systm.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/in_systm.h rename to ndk/build/platforms/android-3/common/include/netinet/in_systm.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/ip.h b/ndk/build/platforms/android-3/common/include/netinet/ip.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/ip.h rename to ndk/build/platforms/android-3/common/include/netinet/ip.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/ip_icmp.h b/ndk/build/platforms/android-3/common/include/netinet/ip_icmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/ip_icmp.h rename to ndk/build/platforms/android-3/common/include/netinet/ip_icmp.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/tcp.h b/ndk/build/platforms/android-3/common/include/netinet/tcp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/tcp.h rename to ndk/build/platforms/android-3/common/include/netinet/tcp.h diff --git a/ndk/build/platforms/android-1.5/common/include/netinet/udp.h b/ndk/build/platforms/android-3/common/include/netinet/udp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netinet/udp.h rename to ndk/build/platforms/android-3/common/include/netinet/udp.h diff --git a/ndk/build/platforms/android-1.5/common/include/netpacket/packet.h b/ndk/build/platforms/android-3/common/include/netpacket/packet.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/netpacket/packet.h rename to ndk/build/platforms/android-3/common/include/netpacket/packet.h diff --git a/ndk/build/platforms/android-1.5/common/include/new b/ndk/build/platforms/android-3/common/include/new similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/new rename to ndk/build/platforms/android-3/common/include/new diff --git a/ndk/build/platforms/android-1.5/common/include/nsswitch.h b/ndk/build/platforms/android-3/common/include/nsswitch.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/nsswitch.h rename to ndk/build/platforms/android-3/common/include/nsswitch.h diff --git a/ndk/build/platforms/android-1.5/common/include/pathconf.h b/ndk/build/platforms/android-3/common/include/pathconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/pathconf.h rename to ndk/build/platforms/android-3/common/include/pathconf.h diff --git a/ndk/build/platforms/android-1.5/common/include/paths.h b/ndk/build/platforms/android-3/common/include/paths.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/paths.h rename to ndk/build/platforms/android-3/common/include/paths.h diff --git a/ndk/build/platforms/android-1.5/common/include/poll.h b/ndk/build/platforms/android-3/common/include/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/poll.h rename to ndk/build/platforms/android-3/common/include/poll.h diff --git a/ndk/build/platforms/android-1.5/common/include/pthread.h b/ndk/build/platforms/android-3/common/include/pthread.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/pthread.h rename to ndk/build/platforms/android-3/common/include/pthread.h diff --git a/ndk/build/platforms/android-1.5/common/include/pwd.h b/ndk/build/platforms/android-3/common/include/pwd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/pwd.h rename to ndk/build/platforms/android-3/common/include/pwd.h diff --git a/ndk/build/platforms/android-1.5/common/include/resolv.h b/ndk/build/platforms/android-3/common/include/resolv.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/resolv.h rename to ndk/build/platforms/android-3/common/include/resolv.h diff --git a/ndk/build/platforms/android-1.5/common/include/sched.h b/ndk/build/platforms/android-3/common/include/sched.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sched.h rename to ndk/build/platforms/android-3/common/include/sched.h diff --git a/ndk/build/platforms/android-1.5/common/include/semaphore.h b/ndk/build/platforms/android-3/common/include/semaphore.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/semaphore.h rename to ndk/build/platforms/android-3/common/include/semaphore.h diff --git a/ndk/build/platforms/android-1.5/common/include/setjmp.h b/ndk/build/platforms/android-3/common/include/setjmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/setjmp.h rename to ndk/build/platforms/android-3/common/include/setjmp.h diff --git a/ndk/build/platforms/android-1.5/common/include/sgtty.h b/ndk/build/platforms/android-3/common/include/sgtty.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sgtty.h rename to ndk/build/platforms/android-3/common/include/sgtty.h diff --git a/ndk/build/platforms/android-1.5/common/include/sha1.h b/ndk/build/platforms/android-3/common/include/sha1.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sha1.h rename to ndk/build/platforms/android-3/common/include/sha1.h diff --git a/ndk/build/platforms/android-1.5/common/include/signal.h b/ndk/build/platforms/android-3/common/include/signal.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/signal.h rename to ndk/build/platforms/android-3/common/include/signal.h diff --git a/ndk/build/platforms/android-1.5/common/include/stdint.h b/ndk/build/platforms/android-3/common/include/stdint.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/stdint.h rename to ndk/build/platforms/android-3/common/include/stdint.h diff --git a/ndk/build/platforms/android-1.5/common/include/stdio.h b/ndk/build/platforms/android-3/common/include/stdio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/stdio.h rename to ndk/build/platforms/android-3/common/include/stdio.h diff --git a/ndk/build/platforms/android-1.5/common/include/stdlib.h b/ndk/build/platforms/android-3/common/include/stdlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/stdlib.h rename to ndk/build/platforms/android-3/common/include/stdlib.h diff --git a/ndk/build/platforms/android-1.5/common/include/stl_pair.h b/ndk/build/platforms/android-3/common/include/stl_pair.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/stl_pair.h rename to ndk/build/platforms/android-3/common/include/stl_pair.h diff --git a/ndk/build/platforms/android-1.5/common/include/string.h b/ndk/build/platforms/android-3/common/include/string.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/string.h rename to ndk/build/platforms/android-3/common/include/string.h diff --git a/ndk/build/platforms/android-1.5/common/include/strings.h b/ndk/build/platforms/android-3/common/include/strings.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/strings.h rename to ndk/build/platforms/android-3/common/include/strings.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/_errdefs.h b/ndk/build/platforms/android-3/common/include/sys/_errdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/_errdefs.h rename to ndk/build/platforms/android-3/common/include/sys/_errdefs.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/_sigdefs.h b/ndk/build/platforms/android-3/common/include/sys/_sigdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/_sigdefs.h rename to ndk/build/platforms/android-3/common/include/sys/_sigdefs.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/_system_properties.h b/ndk/build/platforms/android-3/common/include/sys/_system_properties.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/_system_properties.h rename to ndk/build/platforms/android-3/common/include/sys/_system_properties.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/_types.h b/ndk/build/platforms/android-3/common/include/sys/_types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/_types.h rename to ndk/build/platforms/android-3/common/include/sys/_types.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/atomics.h b/ndk/build/platforms/android-3/common/include/sys/atomics.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/atomics.h rename to ndk/build/platforms/android-3/common/include/sys/atomics.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/cdefs.h b/ndk/build/platforms/android-3/common/include/sys/cdefs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/cdefs.h rename to ndk/build/platforms/android-3/common/include/sys/cdefs.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/cdefs_elf.h b/ndk/build/platforms/android-3/common/include/sys/cdefs_elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/cdefs_elf.h rename to ndk/build/platforms/android-3/common/include/sys/cdefs_elf.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/dirent.h b/ndk/build/platforms/android-3/common/include/sys/dirent.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/dirent.h rename to ndk/build/platforms/android-3/common/include/sys/dirent.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/endian.h b/ndk/build/platforms/android-3/common/include/sys/endian.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/endian.h rename to ndk/build/platforms/android-3/common/include/sys/endian.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/epoll.h b/ndk/build/platforms/android-3/common/include/sys/epoll.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/epoll.h rename to ndk/build/platforms/android-3/common/include/sys/epoll.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/errno.h b/ndk/build/platforms/android-3/common/include/sys/errno.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/errno.h rename to ndk/build/platforms/android-3/common/include/sys/errno.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/exec_elf.h b/ndk/build/platforms/android-3/common/include/sys/exec_elf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/exec_elf.h rename to ndk/build/platforms/android-3/common/include/sys/exec_elf.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/file.h b/ndk/build/platforms/android-3/common/include/sys/file.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/file.h rename to ndk/build/platforms/android-3/common/include/sys/file.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/fsuid.h b/ndk/build/platforms/android-3/common/include/sys/fsuid.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/fsuid.h rename to ndk/build/platforms/android-3/common/include/sys/fsuid.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/inotify.h b/ndk/build/platforms/android-3/common/include/sys/inotify.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/inotify.h rename to ndk/build/platforms/android-3/common/include/sys/inotify.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ioctl.h b/ndk/build/platforms/android-3/common/include/sys/ioctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ioctl.h rename to ndk/build/platforms/android-3/common/include/sys/ioctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ioctl_compat.h b/ndk/build/platforms/android-3/common/include/sys/ioctl_compat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ioctl_compat.h rename to ndk/build/platforms/android-3/common/include/sys/ioctl_compat.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ipc.h b/ndk/build/platforms/android-3/common/include/sys/ipc.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ipc.h rename to ndk/build/platforms/android-3/common/include/sys/ipc.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/klog.h b/ndk/build/platforms/android-3/common/include/sys/klog.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/klog.h rename to ndk/build/platforms/android-3/common/include/sys/klog.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/limits.h b/ndk/build/platforms/android-3/common/include/sys/limits.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/limits.h rename to ndk/build/platforms/android-3/common/include/sys/limits.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/linux-syscalls.h b/ndk/build/platforms/android-3/common/include/sys/linux-syscalls.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/linux-syscalls.h rename to ndk/build/platforms/android-3/common/include/sys/linux-syscalls.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/linux-unistd.h b/ndk/build/platforms/android-3/common/include/sys/linux-unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/linux-unistd.h rename to ndk/build/platforms/android-3/common/include/sys/linux-unistd.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/mman.h b/ndk/build/platforms/android-3/common/include/sys/mman.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/mman.h rename to ndk/build/platforms/android-3/common/include/sys/mman.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/mount.h b/ndk/build/platforms/android-3/common/include/sys/mount.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/mount.h rename to ndk/build/platforms/android-3/common/include/sys/mount.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/param.h b/ndk/build/platforms/android-3/common/include/sys/param.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/param.h rename to ndk/build/platforms/android-3/common/include/sys/param.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/poll.h b/ndk/build/platforms/android-3/common/include/sys/poll.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/poll.h rename to ndk/build/platforms/android-3/common/include/sys/poll.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/prctl.h b/ndk/build/platforms/android-3/common/include/sys/prctl.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/prctl.h rename to ndk/build/platforms/android-3/common/include/sys/prctl.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ptrace.h b/ndk/build/platforms/android-3/common/include/sys/ptrace.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ptrace.h rename to ndk/build/platforms/android-3/common/include/sys/ptrace.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/reboot.h b/ndk/build/platforms/android-3/common/include/sys/reboot.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/reboot.h rename to ndk/build/platforms/android-3/common/include/sys/reboot.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/resource.h b/ndk/build/platforms/android-3/common/include/sys/resource.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/resource.h rename to ndk/build/platforms/android-3/common/include/sys/resource.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/select.h b/ndk/build/platforms/android-3/common/include/sys/select.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/select.h rename to ndk/build/platforms/android-3/common/include/sys/select.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/sendfile.h b/ndk/build/platforms/android-3/common/include/sys/sendfile.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/sendfile.h rename to ndk/build/platforms/android-3/common/include/sys/sendfile.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/socket.h b/ndk/build/platforms/android-3/common/include/sys/socket.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/socket.h rename to ndk/build/platforms/android-3/common/include/sys/socket.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/socketcalls.h b/ndk/build/platforms/android-3/common/include/sys/socketcalls.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/socketcalls.h rename to ndk/build/platforms/android-3/common/include/sys/socketcalls.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/stat.h b/ndk/build/platforms/android-3/common/include/sys/stat.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/stat.h rename to ndk/build/platforms/android-3/common/include/sys/stat.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/statfs.h b/ndk/build/platforms/android-3/common/include/sys/statfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/statfs.h rename to ndk/build/platforms/android-3/common/include/sys/statfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/syscall.h b/ndk/build/platforms/android-3/common/include/sys/syscall.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/syscall.h rename to ndk/build/platforms/android-3/common/include/sys/syscall.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/sysconf.h b/ndk/build/platforms/android-3/common/include/sys/sysconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/sysconf.h rename to ndk/build/platforms/android-3/common/include/sys/sysconf.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/sysinfo.h b/ndk/build/platforms/android-3/common/include/sys/sysinfo.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/sysinfo.h rename to ndk/build/platforms/android-3/common/include/sys/sysinfo.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/syslimits.h b/ndk/build/platforms/android-3/common/include/sys/syslimits.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/syslimits.h rename to ndk/build/platforms/android-3/common/include/sys/syslimits.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/sysmacros.h b/ndk/build/platforms/android-3/common/include/sys/sysmacros.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/sysmacros.h rename to ndk/build/platforms/android-3/common/include/sys/sysmacros.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/system_properties.h b/ndk/build/platforms/android-3/common/include/sys/system_properties.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/system_properties.h rename to ndk/build/platforms/android-3/common/include/sys/system_properties.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/time.h b/ndk/build/platforms/android-3/common/include/sys/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/time.h rename to ndk/build/platforms/android-3/common/include/sys/time.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/timeb.h b/ndk/build/platforms/android-3/common/include/sys/timeb.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/timeb.h rename to ndk/build/platforms/android-3/common/include/sys/timeb.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/times.h b/ndk/build/platforms/android-3/common/include/sys/times.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/times.h rename to ndk/build/platforms/android-3/common/include/sys/times.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ttychars.h b/ndk/build/platforms/android-3/common/include/sys/ttychars.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ttychars.h rename to ndk/build/platforms/android-3/common/include/sys/ttychars.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/ttydev.h b/ndk/build/platforms/android-3/common/include/sys/ttydev.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/ttydev.h rename to ndk/build/platforms/android-3/common/include/sys/ttydev.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/types.h b/ndk/build/platforms/android-3/common/include/sys/types.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/types.h rename to ndk/build/platforms/android-3/common/include/sys/types.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/uio.h b/ndk/build/platforms/android-3/common/include/sys/uio.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/uio.h rename to ndk/build/platforms/android-3/common/include/sys/uio.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/un.h b/ndk/build/platforms/android-3/common/include/sys/un.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/un.h rename to ndk/build/platforms/android-3/common/include/sys/un.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/utime.h b/ndk/build/platforms/android-3/common/include/sys/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/utime.h rename to ndk/build/platforms/android-3/common/include/sys/utime.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/utsname.h b/ndk/build/platforms/android-3/common/include/sys/utsname.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/utsname.h rename to ndk/build/platforms/android-3/common/include/sys/utsname.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/vfs.h b/ndk/build/platforms/android-3/common/include/sys/vfs.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/vfs.h rename to ndk/build/platforms/android-3/common/include/sys/vfs.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/vt.h b/ndk/build/platforms/android-3/common/include/sys/vt.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/vt.h rename to ndk/build/platforms/android-3/common/include/sys/vt.h diff --git a/ndk/build/platforms/android-1.5/common/include/sys/wait.h b/ndk/build/platforms/android-3/common/include/sys/wait.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/sys/wait.h rename to ndk/build/platforms/android-3/common/include/sys/wait.h diff --git a/ndk/build/platforms/android-1.5/common/include/syslog.h b/ndk/build/platforms/android-3/common/include/syslog.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/syslog.h rename to ndk/build/platforms/android-3/common/include/syslog.h diff --git a/ndk/build/platforms/android-1.5/common/include/termios.h b/ndk/build/platforms/android-3/common/include/termios.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/termios.h rename to ndk/build/platforms/android-3/common/include/termios.h diff --git a/ndk/build/platforms/android-1.5/common/include/thread_db.h b/ndk/build/platforms/android-3/common/include/thread_db.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/thread_db.h rename to ndk/build/platforms/android-3/common/include/thread_db.h diff --git a/ndk/build/platforms/android-1.5/common/include/time.h b/ndk/build/platforms/android-3/common/include/time.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/time.h rename to ndk/build/platforms/android-3/common/include/time.h diff --git a/ndk/build/platforms/android-1.5/common/include/time64.h b/ndk/build/platforms/android-3/common/include/time64.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/time64.h rename to ndk/build/platforms/android-3/common/include/time64.h diff --git a/ndk/build/platforms/android-1.5/common/include/typeinfo b/ndk/build/platforms/android-3/common/include/typeinfo similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/typeinfo rename to ndk/build/platforms/android-3/common/include/typeinfo diff --git a/ndk/build/platforms/android-1.5/common/include/unistd.h b/ndk/build/platforms/android-3/common/include/unistd.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/unistd.h rename to ndk/build/platforms/android-3/common/include/unistd.h diff --git a/ndk/build/platforms/android-1.5/common/include/util.h b/ndk/build/platforms/android-3/common/include/util.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/util.h rename to ndk/build/platforms/android-3/common/include/util.h diff --git a/ndk/build/platforms/android-1.5/common/include/utility b/ndk/build/platforms/android-3/common/include/utility similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/utility rename to ndk/build/platforms/android-3/common/include/utility diff --git a/ndk/build/platforms/android-1.5/common/include/utime.h b/ndk/build/platforms/android-3/common/include/utime.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/utime.h rename to ndk/build/platforms/android-3/common/include/utime.h diff --git a/ndk/build/platforms/android-1.5/common/include/utmp.h b/ndk/build/platforms/android-3/common/include/utmp.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/utmp.h rename to ndk/build/platforms/android-3/common/include/utmp.h diff --git a/ndk/build/platforms/android-1.5/common/include/wchar.h b/ndk/build/platforms/android-3/common/include/wchar.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/wchar.h rename to ndk/build/platforms/android-3/common/include/wchar.h diff --git a/ndk/build/platforms/android-1.5/common/include/wctype.h b/ndk/build/platforms/android-3/common/include/wctype.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/wctype.h rename to ndk/build/platforms/android-3/common/include/wctype.h diff --git a/ndk/build/platforms/android-1.5/common/include/zconf.h b/ndk/build/platforms/android-3/common/include/zconf.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/zconf.h rename to ndk/build/platforms/android-3/common/include/zconf.h diff --git a/ndk/build/platforms/android-1.5/common/include/zlib.h b/ndk/build/platforms/android-3/common/include/zlib.h similarity index 100% rename from ndk/build/platforms/android-1.5/common/include/zlib.h rename to ndk/build/platforms/android-3/common/include/zlib.h diff --git a/ndk/build/tools/build-ndk-sysroot.sh b/ndk/build/tools/build-ndk-sysroot.sh index 7a79e9202..874122045 100755 --- a/ndk/build/tools/build-ndk-sysroot.sh +++ b/ndk/build/tools/build-ndk-sysroot.sh @@ -31,7 +31,7 @@ source `dirname $0`/../core/ndk-common.sh # PLATFORM is the name of the current Android system platform -PLATFORM=android-1.5 +PLATFORM=android-3 # ABI is the target ABI name for the NDK ABI=arm diff --git a/ndk/build/tools/build-toolchain.sh b/ndk/build/tools/build-toolchain.sh index 42f727682..95bf10049 100755 --- a/ndk/build/tools/build-toolchain.sh +++ b/ndk/build/tools/build-toolchain.sh @@ -27,7 +27,7 @@ source `dirname $0`/../core/ndk-common.sh JOBS=$HOST_NUM_CPUS TOOLCHAIN_NAME=arm-eabi-4.2.1 -PLATFORM=android-1.5 +PLATFORM=android-3 ABI=arm OPTION_HELP=no diff --git a/ndk/docs/ANDROID-MK.TXT b/ndk/docs/ANDROID-MK.TXT index 235b4b2d9..9a77ab199 100644 --- a/ndk/docs/ANDROID-MK.TXT +++ b/ndk/docs/ANDROID-MK.TXT @@ -201,7 +201,8 @@ TARGET_ARCH TARGET_PLATFORM Name of the target Android platform when this Android.mk is parsed. - For now, only 'android-1.5' is supported. + For now, only 'android-3' is supported, which corresponds to the + Android 1.5 platform. TARGET_ARCH_ABI Name of the target CPU+ABI when this Android.mk is parsed. @@ -219,7 +220,7 @@ TARGET_ABI as $(TARGET_PLATFORM)-$(TARGET_ARCH_ABI) and is useful when you want to test against a specific target system image for a real device. - By default, this will be 'android-1.5-arm' + By default, this will be 'android-3-arm' NDK-provided function macros: diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT index 56990fca6..411fe567d 100644 --- a/ndk/docs/CHANGES.TXT +++ b/ndk/docs/CHANGES.TXT @@ -40,4 +40,4 @@ current version Note that APP_CPPFLAGS / APP_CFLAGS / APP_CXXFLAGS continue to work. ------------------------------------------------------------------------------- -android-1.5_r1 released. +android-ndk-1.5_r1 released. diff --git a/ndk/docs/STABLE-APIS.TXT b/ndk/docs/STABLE-APIS.TXT index 743d65707..3bf30392f 100644 --- a/ndk/docs/STABLE-APIS.TXT +++ b/ndk/docs/STABLE-APIS.TXT @@ -88,7 +88,7 @@ Android-specific Log Support: contains various definitions that can be used to send log messages to the kernel from your native code. Please have a look at its content in -(build/platforms/android-1.5/common/include/android/log.h), which contain many +(build/platforms/android-3/common/include/android/log.h), which contain many informative comments on how to use it. You should be able to write helpful wrapper macros for your own usage to