| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 endif | 47 endif |
| 48 | 48 |
| 49 ifeq ($(ARCH), android_arm) | 49 ifeq ($(ARCH), android_arm) |
| 50 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_
target_platform=14 | 50 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_
target_platform=14 |
| 51 DEFINES += arm_neon=0 arm_version=7 | 51 DEFINES += arm_neon=0 arm_version=7 |
| 52 TOOLCHAIN_ARCH = arm-linux-androideabi | 52 TOOLCHAIN_ARCH = arm-linux-androideabi |
| 53 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 53 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 54 TOOLCHAIN_VER = 4.6 | 54 TOOLCHAIN_VER = 4.6 |
| 55 else | 55 else |
| 56 ifeq ($(ARCH), android_arm64) | 56 ifeq ($(ARCH), android_arm64) |
| 57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64
android_target_platform=20 | 57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64
android_target_platform=L |
| 58 TOOLCHAIN_ARCH = aarch64-linux-android | 58 TOOLCHAIN_ARCH = aarch64-linux-android |
| 59 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 59 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 60 TOOLCHAIN_VER = 4.8 | 60 TOOLCHAIN_VER = 4.9 |
| 61 else | 61 else |
| 62 ifeq ($(ARCH), android_mipsel) | 62 ifeq ($(ARCH), android_mipsel) |
| 63 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platfor
m=14 | 63 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platfor
m=14 |
| 64 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 | 64 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 |
| 65 TOOLCHAIN_ARCH = mipsel-linux-android | 65 TOOLCHAIN_ARCH = mipsel-linux-android |
| 66 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 66 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 67 TOOLCHAIN_VER = 4.6 | 67 TOOLCHAIN_VER = 4.6 |
| 68 | 68 |
| 69 else | 69 else |
| 70 ifeq ($(ARCH), android_ia32) | 70 ifeq ($(ARCH), android_ia32) |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) | 117 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) |
| 118 $(ANDROID_MAKEFILES): | 118 $(ANDROID_MAKEFILES): |
| 119 GYP_GENERATORS=make-android \ | 119 GYP_GENERATORS=make-android \ |
| 120 GYP_DEFINES="${DEFINES}" \ | 120 GYP_DEFINES="${DEFINES}" \ |
| 121 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ | 121 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ |
| 122 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ | 122 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ |
| 123 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:
$(PYTHONPATH)" \ | 123 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:
$(PYTHONPATH)" \ |
| 124 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ | 124 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
| 125 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ | 125 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ |
| 126 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} | 126 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} |
| OLD | NEW |