From 8ad2a3af80022fddbf98ac4af7286d9ddaf565f9 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Tue, 2 Apr 2013 15:29:13 -0700
Subject: [PATCH] update include paths and symbols for eclipse

- we define __SIZE_TYPE__ and __PTRDIFF_TYPE__ in symbols
  because for some reason Eclipse barfs on stddef.h otherwise.
  This seems to solve the problem entirely.

- removed symbols for HAVE_xxx because those should come
  from AndroidConfig.h

NOTE: make sure to set

  ${ProjDirPath}/build/core/combo/include/arch/linux-arm/AndroidConfig.h

in Eclipse's "Paths and Symbols" / "Include Files" tab. This tab is
NOT shown by default, it needs to be enabled in the global
preference panel under "C/C++" / "Property Pages Settings".

As far as I can tell this setting is not exportable.

Change-Id: I1aa185b4b3564118cb9da19b2f932b7b37b81167
---
 ide/eclipse/android-include-paths.xml | 15 ++++-
 ide/eclipse/android-symbols.xml       | 81 ++++++++++++++++++---------
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/ide/eclipse/android-include-paths.xml b/ide/eclipse/android-include-paths.xml
index 7aee69ee7..be188bd47 100644
--- a/ide/eclipse/android-include-paths.xml
+++ b/ide/eclipse/android-include-paths.xml
@@ -5,6 +5,7 @@
 
 </language>
 <language name="Assembly">
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7/lib/gcc/arm-eabi/4.7/include</includepath>
 <includepath>${ProjDirPath}/build/core/combo/include/arch/linux-arm</includepath>
 <includepath>${ProjDirPath}/system/core/include</includepath>
 <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
@@ -27,10 +28,13 @@
 <includepath>${ProjDirPath}/external/skia/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include/core</includepath>
 <includepath>${ProjDirPath}/libnativehelper/include/nativehelper</includepath>
-<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
+<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
 
 </language>
 <language name="GNU C++">
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7/lib/gcc/arm-eabi/4.7/include</includepath>
 <includepath>${ProjDirPath}/build/core/combo/include/arch/linux-arm</includepath>
 <includepath>${ProjDirPath}/system/core/include</includepath>
 <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
@@ -53,10 +57,13 @@
 <includepath>${ProjDirPath}/external/skia/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include/core</includepath>
 <includepath>${ProjDirPath}/libnativehelper/include/nativehelper</includepath>
-<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
+<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
 
 </language>
 <language name="GNU C">
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7/lib/gcc/arm-eabi/4.7/include</includepath>
 <includepath>${ProjDirPath}/build/core/combo/include/arch/linux-arm</includepath>
 <includepath>${ProjDirPath}/system/core/include</includepath>
 <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
@@ -79,7 +86,9 @@
 <includepath>${ProjDirPath}/external/skia/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include/core</includepath>
 <includepath>${ProjDirPath}/libnativehelper/include/nativehelper</includepath>
-<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
+<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
+<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
 
 </language>
 </section>
diff --git a/ide/eclipse/android-symbols.xml b/ide/eclipse/android-symbols.xml
index 3fae03fbb..f503a6d6b 100644
--- a/ide/eclipse/android-symbols.xml
+++ b/ide/eclipse/android-symbols.xml
@@ -6,9 +6,6 @@
 </language>
 <language name="Assembly">
 <macro>
-<name>HAVE_ANDROID_OS</name><value>1</value>
-</macro>
-<macro>
 <name>NDEBUG</name><value>1</value>
 </macro>
 <macro>
@@ -21,24 +18,33 @@
 <name>__OPTIMIZE__</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_FUTEX</name><value>1</value>
-</macro>
-<macro>
-<name>HAVE_PTHREADS</name><value>1</value>
-</macro>
-<macro>
 <name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
 <name>LOG_TAG</name><value>"tag"</value>
 </macro>
+<macro>
+<name>__STDC_HOSTED__</name><value>1</value>
+</macro>
+<macro>
+<name>USE_OPENGL_RENDERER</name><value>1</value>
+</macro>
+<macro>
+<name>__STDC__</name><value>1</value>
+</macro>
+<macro>
+<name>__ANDROID__</name><value>1</value>
+</macro>
+<macro>
+<name>__SIZE_TYPE__</name><value>unsigned int</value>
+</macro>
+<macro>
+<name>__PTRDIFF_TYPE__</name><value>int</value>
+</macro>
 
 </language>
 <language name="GNU C++">
 <macro>
-<name>HAVE_ANDROID_OS</name><value>1</value>
-</macro>
-<macro>
 <name>NDEBUG</name><value>1</value>
 </macro>
 <macro>
@@ -51,24 +57,33 @@
 <name>__OPTIMIZE__</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_FUTEX</name><value>1</value>
-</macro>
-<macro>
-<name>HAVE_PTHREADS</name><value>1</value>
-</macro>
-<macro>
 <name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
 <name>LOG_TAG</name><value>"tag"</value>
 </macro>
+<macro>
+<name>__STDC_HOSTED__</name><value>1</value>
+</macro>
+<macro>
+<name>USE_OPENGL_RENDERER</name><value>1</value>
+</macro>
+<macro>
+<name>__STDC__</name><value>1</value>
+</macro>
+<macro>
+<name>__ANDROID__</name><value>1</value>
+</macro>
+<macro>
+<name>__SIZE_TYPE__</name><value>unsigned int</value>
+</macro>
+<macro>
+<name>__PTRDIFF_TYPE__</name><value>int</value>
+</macro>
 
 </language>
 <language name="GNU C">
 <macro>
-<name>HAVE_ANDROID_OS</name><value>1</value>
-</macro>
-<macro>
 <name>NDEBUG</name><value>1</value>
 </macro>
 <macro>
@@ -81,17 +96,29 @@
 <name>__OPTIMIZE__</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_FUTEX</name><value>1</value>
-</macro>
-<macro>
-<name>HAVE_PTHREADS</name><value>1</value>
-</macro>
-<macro>
 <name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
 <name>LOG_TAG</name><value>"tag"</value>
 </macro>
+<macro>
+<name>__STDC_HOSTED__</name><value>1</value>
+</macro>
+<macro>
+<name>USE_OPENGL_RENDERER</name><value>1</value>
+</macro>
+<macro>
+<name>__STDC__</name><value>1</value>
+</macro>
+<macro>
+<name>__ANDROID__</name><value>1</value>
+</macro>
+<macro>
+<name>__SIZE_TYPE__</name><value>unsigned int</value>
+</macro>
+<macro>
+<name>__PTRDIFF_TYPE__</name><value>int</value>
+</macro>
 
 </language>
 </section>