| commit | c7296b6f100fff7ab21fb1f512e9f230f4cae048 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Dec 05 18:57:28 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 05 18:57:28 2014 +0000 |
| tree | 8240aafcfd30dd11d60c3f7fcbea5593d617db2c | |
| parent | 9658bda351e8e9226181b411eeb14b5cc3618471 [diff] | |
| parent | 4b57e512c74a3b371d188eadd53c4af4db6ce636 [diff] |
Merge "Remove ARCH_X86."
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 3c47056..d3df919 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h
@@ -66,11 +66,6 @@ /* #define HAVE_MALLOC_H */ /* - * What CPU architecture does this platform use? - */ -#define ARCH_X86 - -/* * sprintf() format string for shared library naming. */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.dylib"
diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 3d57efe..10e6e11 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h
@@ -66,11 +66,6 @@ #define HAVE_MALLOC_H /* - * What CPU architecture does this platform use? - */ -#define ARCH_X86 - -/* * Define if system provides a system property server (should be * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). */
diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index e294167..c89d675 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h
@@ -64,11 +64,6 @@ #define HAVE_LIBC_SYSTEM_PROPERTIES 1 /* - * What CPU architecture does this platform use? - */ -#define ARCH_X86 - -/* * sprintf() format string for shared library naming. */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so"
diff --git a/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h index 4e2186e..3e2f3af 100644 --- a/core/combo/include/arch/windows/AndroidConfig.h +++ b/core/combo/include/arch/windows/AndroidConfig.h
@@ -98,11 +98,6 @@ #define HAVE_WINDOWS_PATHS /* needed by simulator */ /* - * What CPU architecture does this platform use? - */ -#define ARCH_X86 - -/* * sprintf() format string for shared library naming. */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.dll"