summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlamefire <alex@grundis.de>2014-01-28 17:47:38 +0100
committerFlamefire <alex@grundis.de>2014-01-28 17:47:38 +0100
commit0c0ea97cc5a730947d43ba16920c89f8253fcc65 (patch)
treef63864f71aa1ac591c48860ad315593933b8cc9c
parent243ea154f74e5748f529e18a4a1d7181d5abb516 (diff)
downloadandroid_development-0c0ea97cc5a730947d43ba16920c89f8253fcc65.tar.gz
android_development-0c0ea97cc5a730947d43ba16920c89f8253fcc65.tar.bz2
android_development-0c0ea97cc5a730947d43ba16920c89f8253fcc65.zip
Allow importing of settings into eclipse
Eclipse XML format seems to have changed. Importing silently failed before this fix. Change-Id: I15d951a8fde5b57268da92b1351c2c7d8252b111
-rw-r--r--ide/eclipse/android-include-paths.xml9
-rw-r--r--ide/eclipse/android-symbols.xml9
2 files changed, 6 insertions, 12 deletions
diff --git a/ide/eclipse/android-include-paths.xml b/ide/eclipse/android-include-paths.xml
index 4487fa43a..c7c69b083 100644
--- a/ide/eclipse/android-include-paths.xml
+++ b/ide/eclipse/android-include-paths.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<cdtprojectproperties>
<section name="org.eclipse.cdt.internal.ui.wizards.settingswizards.IncludePaths">
-<language name="holder for library settings">
-
-</language>
-<language name="Assembly">
+<language name="Assembly Source File">
<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>
@@ -34,7 +31,7 @@
<includepath>${ProjDirPath}/system/media/camera/include</includepath>
</language>
-<language name="GNU C++">
+<language name="C++ Source File">
<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>
@@ -64,7 +61,7 @@
<includepath>${ProjDirPath}/system/media/camera/include</includepath>
</language>
-<language name="GNU C">
+<language name="C Source File">
<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>
diff --git a/ide/eclipse/android-symbols.xml b/ide/eclipse/android-symbols.xml
index f503a6d6b..3fd515741 100644
--- a/ide/eclipse/android-symbols.xml
+++ b/ide/eclipse/android-symbols.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<cdtprojectproperties>
<section name="org.eclipse.cdt.internal.ui.wizards.settingswizards.Macros">
-<language name="holder for library settings">
-
-</language>
-<language name="Assembly">
+<language name="Assembly Source File">
<macro>
<name>NDEBUG</name><value>1</value>
</macro>
@@ -43,7 +40,7 @@
</macro>
</language>
-<language name="GNU C++">
+<language name="C++ Source File">
<macro>
<name>NDEBUG</name><value>1</value>
</macro>
@@ -82,7 +79,7 @@
</macro>
</language>
-<language name="GNU C">
+<language name="C Source File">
<macro>
<name>NDEBUG</name><value>1</value>
</macro>