update eclipse C++ include paths and updated README for C++ instructions
* add 1 more include path needed for frameworks/av to index correctly
* update README.importing-to-eclipse.txt for importing C++ files/symbols/paths
Change-Id: If967e5e9df28267f06e7b7451ba4c266776d58a2
diff --git a/ide/eclipse/README.importing-to-eclipse.txt b/ide/eclipse/README.importing-to-eclipse.txt
index dffa0ab..c98bf52 100644
--- a/ide/eclipse/README.importing-to-eclipse.txt
+++ b/ide/eclipse/README.importing-to-eclipse.txt
@@ -1,6 +1,33 @@
+(Java)
+
To import the formatter, go to the preferences, section Java > Code Style >
formatter, then click on import and choose
development/ide/eclipse/android-formatting.xml
To import the import order, to go into Java > Code Style > Organize Import,
then click on import and choose development/ide/eclipse/android.importorder
+
+(C++)
+
+To import the include paths, go to Project > Properties > C/C++ General >
+Paths and Symbols, then click on "Includes" and then click on "Import Settings".
+Choose development/ide/eclipse/android-include-paths.xml and hit Finish.
+You will need to re-index for the changes to get picked up (right click project
+in Package Explorer, then Index > Rebuild).
+
+To import the symbols, go to Project > Properties > C/C++ General >
+Paths and Symbols, then click on "Symbols" and then click on "Import Settings".
+Choose development/ide/eclipse/android-symbols.xml and hit Finish.
+You will need to re-index for the changes to get picked up (right click project
+in Package Explorer, then Index > Rebuild).
+
+In addition, you will need to add some include files (no way to import this
+from an XML file) by hand. Go to Project > Properties > C/C++ General >
+Paths and Symbols, then click on "Include Files" and click on "Add". Check
+"Add to all configurations" and "Add to all languages". Repeat for these files:
+
+ ${ProjDirPath}/build/core/combo/include/arch/linux-arm/AndroidConfig.h
+
+If you are having trouble seeing the "Include Files" tab, you will need to
+enable it in the global preference panel under "C/C++" /
+"Property Pages Settings".
diff --git a/ide/eclipse/android-include-paths.xml b/ide/eclipse/android-include-paths.xml
index be188bd..4487fa4 100644
--- a/ide/eclipse/android-include-paths.xml
+++ b/ide/eclipse/android-include-paths.xml
@@ -31,6 +31,7 @@
<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
+<includepath>${ProjDirPath}/system/media/camera/include</includepath>
</language>
<language name="GNU C++">
@@ -60,6 +61,7 @@
<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
+<includepath>${ProjDirPath}/system/media/camera/include</includepath>
</language>
<language name="GNU C">
@@ -89,6 +91,7 @@
<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
+<includepath>${ProjDirPath}/system/media/camera/include</includepath>
</language>
</section>
