am 47a0ba95: Merge "update include paths and symbols for eclipse" into jb-mr2-dev

* commit '47a0ba955311ad478edc3e5a973b854bb6ad39af':
  update include paths and symbols for eclipse

2 files changed, 60 insertions, 24 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>
+<name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_PTHREADS</name><value>1</value>
+<name>LOG_TAG</name><value>"tag"</value>
 </macro>
 <macro>
-<name>EGL_TRACE</name><value>1</value>
+<name>__STDC_HOSTED__</name><value>1</value>
 </macro>
 <macro>
-<name>LOG_TAG</name><value>"tag"</value>
+<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>
+<name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_PTHREADS</name><value>1</value>
+<name>LOG_TAG</name><value>"tag"</value>
 </macro>
 <macro>
-<name>EGL_TRACE</name><value>1</value>
+<name>__STDC_HOSTED__</name><value>1</value>
 </macro>
 <macro>
-<name>LOG_TAG</name><value>"tag"</value>
+<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,16 +96,28 @@
 <name>__OPTIMIZE__</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_FUTEX</name><value>1</value>
+<name>EGL_TRACE</name><value>1</value>
 </macro>
 <macro>
-<name>HAVE_PTHREADS</name><value>1</value>
+<name>LOG_TAG</name><value>"tag"</value>
 </macro>
 <macro>
-<name>EGL_TRACE</name><value>1</value>
+<name>__STDC_HOSTED__</name><value>1</value>
 </macro>
 <macro>
-<name>LOG_TAG</name><value>"tag"</value>
+<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>