Martin Storsjö 506826a8ae Fix building android on x86 ...

In 70360cb11, the ASM variable was moved to the x86-common file
even though the android build file didn't include neither
platform-arch.mk nor platform-x86-common.mk.

Instead of explicitly declaring ASM here, include platform-arch.mk
and remove setting of the flags that platform-arch.mk sets.

This is inspired by and based on a patch by Licai Guo.

2014-03-05 15:19:18 +02:00

..

astyle.cfg

Pretty printed the C++ code with astyle

2013-12-12 14:21:12 -08:00

gtest-targets.mk

Regenerate target makefiles after the latest mktargets.py changes

2014-02-12 22:11:05 +02:00

mktargets.py

Update the makefile generator to support .S arm assembly files

2014-03-04 08:56:42 +02:00

mktargets.sh

Exclude the arm assembly header as well

2014-03-04 23:23:19 +02:00

platform-android.mk

Fix building android on x86

2014-03-05 15:19:18 +02:00

platform-arch.mk

Hook up building arm assembly in the generic linux and android makefiles

2014-03-04 08:56:42 +02:00

platform-darwin.mk

Move the ASM variable declaration into the x86-common file

2014-02-28 10:22:19 +02:00

platform-freebsd.mk

Only set x86 ASMFLAGS if building x86 assembly

2014-03-01 23:56:14 +02:00

platform-ios.mk

Add the APPLE_IOS define when building for iOS with make

2014-03-04 09:26:15 +02:00

platform-linux.mk

Hook up building arm assembly in the generic linux and android makefiles

2014-03-04 08:56:42 +02:00

platform-mingw_nt.mk

Move the ASM variable declaration into the x86-common file

2014-02-28 10:22:19 +02:00

platform-msvc-arm.mk

Add platform files for msvc and msvc-arm

2014-01-17 12:06:12 +02:00

platform-msvc-common.mk

Set GTEST_HAS_TR1_TUPLE to 0 on msvc

2014-02-24 15:38:37 +02:00

platform-msvc.mk

Move the ASM variable declaration into the x86-common file

2014-02-28 10:22:19 +02:00

platform-x86-common.mk

Move the ASM variable declaration into the x86-common file

2014-02-28 10:22:19 +02:00