Merge commit 'be3e939838954438779ae189c56484f5d05b500c'

internalG · May 31, 2012 · da0f8a6 · da0f8a6
2 parents 1b538ca + be3e939
commit da0f8a6
Show file tree

Hide file tree

Showing 34 changed files with 1,007 additions and 15 deletions.
diff --git a/build-droid/build-boost.sh b/build-droid/build-boost.sh
@@ -43,10 +43,10 @@ fi
 
 # Extract source
 rm -rf "${BOOST_SOURCE_NAME}"
-tar zxvf "${BOOST_SOURCE_NAME}.tar.gz"
+tar xvf "${BOOST_SOURCE_NAME}.tar.gz"
 
 pushd "${BOOST_SOURCE_NAME}"
-tar zxvf "${TOPDIR}/build-droid/droid-boost-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-boost-patch.tar.gz"
 
 # Build
 

diff --git a/build-droid/build-bzip2.sh b/build-droid/build-bzip2.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "bzip2-${BZIP2_VERSION}"
-tar zxvf "bzip2-${BZIP2_VERSION}.tar.gz"
+tar xvf "bzip2-${BZIP2_VERSION}.tar.gz"
 cp ${TOPDIR}/build-droid/Makefile.bzip2 bzip2-${BZIP2_VERSION}/Makefile
 
 # Build

diff --git a/build-droid/build-cURL.sh b/build-droid/build-cURL.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "curl-${CURL_VERSION}"
-tar zxvf "curl-${CURL_VERSION}.tar.gz"
+tar xvf "curl-${CURL_VERSION}.tar.gz"
 
 # Build
 pushd "curl-${CURL_VERSION}"
@@ -59,7 +59,11 @@ export CFLAGS="-Os -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include"
 export CXXFLAGS="-Os -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include"
 
 #./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --enable-ares=${ROOTDIR} --with-libssh2=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-verbose --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-manual --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls
+
 #./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-libssh2=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --disable-manual --disable-verbose
+
+#./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --enable-verbose --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --without-libssh2 --disable-manual
+
 ./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --without-libssh2 --disable-manual --disable-verbose
 
 # Fix libtool to not create versioned shared libraries

diff --git a/build-droid/build-cares.sh b/build-droid/build-cares.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "c-ares-${CARES_VERSION}"
-tar zxvf "c-ares-${CARES_VERSION}.tar.gz"
+tar xvf "c-ares-${CARES_VERSION}.tar.gz"
 
 # Build
 pushd "c-ares-${CARES_VERSION}"

diff --git a/build-droid/build-expat.sh b/build-droid/build-expat.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "expat-${EXPAT_VERSION}"
-tar zxvf "expat-${EXPAT_VERSION}.tar.gz"
+tar xvf "expat-${EXPAT_VERSION}.tar.gz"
 
 # Build
 pushd "expat-${EXPAT_VERSION}"

diff --git a/build-droid/build-icu.sh b/build-droid/build-icu.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "icu"
-tar zxvf "icu4c-${ICU_VERSION//./_}-src.tgz"
+tar xvf "icu4c-${ICU_VERSION//./_}-src.tgz"
 
 # Build
 
@@ -48,7 +48,7 @@ popd
 
 pushd "icu/source"
 
-tar zxvf "${TOPDIR}/build-droid/droid-icu-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-icu-patch.tar.gz"
 
 # Apply patches to icu
 PATCHES_DIR=${TMPDIR}/icu/source/droid-icu-patch

diff --git a/build-droid/build-libgcrypt.sh b/build-droid/build-libgcrypt.sh
@@ -34,7 +34,11 @@ fi
 
 # Extract source
 rm -rf "libgcrypt-${LIBGCRYPT_VERSION}"
+<<<<<<< HEAD
 tar xvjf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
+=======
+tar xvf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
+>>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgcrypt-${LIBGCRYPT_VERSION}"

diff --git a/build-droid/build-libgpg-error.sh b/build-droid/build-libgpg-error.sh
@@ -34,7 +34,11 @@ fi
 
 # Extract source
 rm -rf "libgpg-error-${LIBGPG_ERROR_VERSION}"
+<<<<<<< HEAD
 tar xvjf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
+=======
+tar xvf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
+>>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgpg-error-${LIBGPG_ERROR_VERSION}"

diff --git a/build-droid/build-libssh2.sh b/build-droid/build-libssh2.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "libssh2-${LIBSSH2_VERSION}"
-tar zxvf "libssh2-${LIBSSH2_VERSION}.tar.gz"
+tar xvf "libssh2-${LIBSSH2_VERSION}.tar.gz"
 
 # Build
 pushd "libssh2-${LIBSSH2_VERSION}"

diff --git a/build-droid/build-openssl.sh b/build-droid/build-openssl.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "openssl-${OPENSSL_VERSION}"
-tar zxvf "openssl-${OPENSSL_VERSION}.tar.gz"
+tar xvf "openssl-${OPENSSL_VERSION}.tar.gz"
 
 # Build
 pushd "openssl-${OPENSSL_VERSION}"

diff --git a/build-droid/build-pion.sh b/build-droid/build-pion.sh
@@ -34,12 +34,12 @@ fi
 
 # Extract source
 rm -fr "pion-net-${PION_VERSION}"
-tar zxvf "pion-net-${PION_VERSION}.tar.gz"
+tar xvf "pion-net-${PION_VERSION}.tar.gz"
 
 # Build
 pushd "pion-net-${PION_VERSION}"
 
-tar zxvf "${TOPDIR}/build-droid/droid-pion-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-pion-patch.tar.gz"
 
 # Apply patches to icu
 PATCHES_DIR=${TMPDIR}/pion-net-${PION_VERSION}/droid-pion-patch

diff --git a/build-droid/build-sqlcipher.sh b/build-droid/build-sqlcipher.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf *-sqlcipher-*
-tar zxvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
+tar xvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
 
 # Build
 pushd *-sqlcipher-*

diff --git a/build-droid/build-yajl.sh b/build-droid/build-yajl.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf lloyd-yajl-*
-tar zxvf "yajl-${YAJL_VERSION}.tar.gz"
+tar xvf "yajl-${YAJL_VERSION}.tar.gz"
 
 # Build
 pushd lloyd-yajl-*

diff --git a/build-droid/build-zlib.sh b/build-droid/build-zlib.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "zlib-${ZLIB_VERSION}"
-tar zxvf "zlib-${ZLIB_VERSION}.tar.gz"
+tar xvf "zlib-${ZLIB_VERSION}.tar.gz"
 cp ${TOPDIR}/build-droid/Makefile.zlib zlib-${ZLIB_VERSION}/Makefile.in
 
 # Build

diff --git a/droid-testapp/.classpath b/droid-testapp/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/droid-testapp/.cproject b/droid-testapp/.cproject
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.android.toolchain.gcc.1014137256">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.1014137256" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="droid-testapp" buildProperties="" description="" id="com.android.toolchain.gcc.1014137256" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="com.android.toolchain.gcc.1014137256.317970392" name="/" resourcePath="">
+						<toolChain id="com.android.toolchain.gcc.1554957628" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1134336683" name="Android Platform" osList="all" superClass="com.android.targetPlatform"/>
+							<builder arguments="NDK_DEBUG=1" buildPath="${workspace_loc:/droid-testapp}/jni" command="ndk-build" id="com.android.builder.949980961" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="com.android.builder">
+								<outputEntries>
+									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
+								</outputEntries>
+							</builder>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.395832940" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="com.android.tool.compiler.g++.1960471276" name="Android G++" superClass="com.android.tool.compiler.g++">
+								<option id="gnu.cpp.compiler.option.include.paths.1933762594" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/platforms/android-14/arch-arm/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/cmoss/bin/droid/include"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/cmoss/bin/certs"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/nadax/NadaxUtility/src/include"/>
+								</option>
+								<inputType id="com.android.tool.compiler.g++.input.1979658009" superClass="com.android.tool.compiler.g++.input"/>
+							</tool>
+							<tool id="com.android.tool.compiler.c.54664535" name="Android GCC" superClass="com.android.tool.compiler.c">
+								<option id="gnu.c.compiler.option.include.paths.550613803" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/platforms/android-14/arch-arm/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include&quot;"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/cmoss/bin/droid/include"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/cmoss/bin/certs"/>
+									<listOptionValue builtIn="false" value="/Users/a292082/Work/mobile/nadax/NadaxUtility/src/include"/>
+								</option>
+								<inputType id="com.android.tool.compiler.c.input.1237494941" superClass="com.android.tool.compiler.c.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1133067310" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.994649645" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1271290086" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1281729689" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.304525696" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="com.android.toolchain.gcc.1014137256.1955296632" name="SSLInit.h" rcbsApplicability="disable" resourcePath="jni/SSLInit.h" toolsToInvoke=""/>
+					<fileInfo id="com.android.toolchain.gcc.1014137256.680854877" name="Executor.h" rcbsApplicability="disable" resourcePath="jni/Executor.h" toolsToInvoke=""/>
+					<sourceEntries>
+						<entry excluding="cmoss-tests-1.c|cmoss-tests.cpp.bak" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="droid-testapp.null.39318130" name="droid-testapp"/>
+	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/droid-testapp"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.1876183300;com.android.tool.compiler.c.54664535.1316847990;com.android.tool.compiler.c.input.367948658">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.1456790286;com.android.tool.compiler.g++.1960471276.1626972349;com.android.tool.compiler.g++.input.1010798875">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.317970392;com.android.tool.compiler.c.54664535;com.android.tool.compiler.c.input.1237494941">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.317970392;com.android.tool.compiler.g++.1960471276;com.android.tool.compiler.g++.input.1979658009">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.1995606583;com.android.tool.compiler.c.54664535.1650016190;com.android.tool.compiler.c.input.2079358986">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.98252696;com.android.tool.compiler.g++.1960471276.499597716;com.android.tool.compiler.g++.input.224534689">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1014137256;com.android.toolchain.gcc.1014137256.906174974;com.android.tool.compiler.g++.1960471276.1034057208;com.android.tool.compiler.g++.input.462801340">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/droid-testapp/.project b/droid-testapp/.project
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>droid-testapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?children?</key>
+					<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|\||</value>
+				</dictionary>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value>NDK_DEBUG=1</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>ndk-build</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/droid-testapp}/jni</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>V=1</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>false</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name></name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>