diff options
| author | Tor Norbye <tnorbye@google.com> | 2011-10-04 12:36:38 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2011-10-04 12:36:38 -0700 |
| commit | 581b1e36c0363da17c2568118c08bff040aab920 (patch) | |
| tree | 6f201aefe7313e7c60dd583fbf1833d5a970832f | |
| parent | 6ebe3b1efa485d9183fb9ce58f8958886fa5be6d (diff) | |
| download | sdk-581b1e36c0363da17c2568118c08bff040aab920.zip sdk-581b1e36c0363da17c2568118c08bff040aab920.tar.gz sdk-581b1e36c0363da17c2568118c08bff040aab920.tar.bz2 | |
Fix build
Change-Id: Ie4e5dcc64ba8e341f2229dce77b07effbe9443ba
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | eclipse/buildConfig/allElements.xml | 7 | ||||
| -rw-r--r-- | eclipse/features/com.android.ide.eclipse.adt/feature.xml | 2 | ||||
| -rwxr-xr-x | eclipse/scripts/build_plugins.sh | 4 |
4 files changed, 7 insertions, 7 deletions
@@ -11,6 +11,7 @@ eclipse/final*Versions*.properties eclipse/plugins/com.android.ide.eclipse.*/@dot* eclipse/plugins/com.android.*/javaCompiler...args eclipse/plugins/com.android.ide.eclipse.adt/build.xml +eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.xml eclipse/plugins/com.android.ide.eclipse.ddms/build.xml eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.xml eclipse/plugins/com.android.ide.eclipse.traceview/build.xml diff --git a/eclipse/buildConfig/allElements.xml b/eclipse/buildConfig/allElements.xml index da4a57d..6bdfa9b 100644 --- a/eclipse/buildConfig/allElements.xml +++ b/eclipse/buildConfig/allElements.xml @@ -34,11 +34,6 @@ <property name="id" value="com.android.ide.eclipse.traceview" /> </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="com.android.ide.eclipse.adt.xml" /> - </ant> - <antcall target="buildInternalFeatures"/> </target> @@ -75,7 +70,7 @@ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - <target name="assemble.com.android.ide.eclipse.adt.xml"> + <target name="assemble.com.android.ide.eclipse.adt.overlay"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index cbb07da..2b0171e 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -151,7 +151,7 @@ This Agreement is governed by the laws of the State of New York and the intellec unpack="false"/> <plugin - id="overlay.com.android.ide.eclipse.adt.xml" + id="overlay.com.android.ide.eclipse.adt.overlay" download-size="0" install-size="0" version="0.0.0" diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh index 5796a6c..c8bcd8d 100755 --- a/eclipse/scripts/build_plugins.sh +++ b/eclipse/scripts/build_plugins.sh @@ -178,6 +178,10 @@ if [ ! -f "$BUILDFILE" ]; then exit 1 fi +# +# Ensure that the src dir exists since it's empty +# +mkdir -p $PWD/eclipse/plugins/com.android.ide.eclipse.adt.overlay/src # # -- Print configuration used and actually execute the build -- |