diff options
| -rw-r--r-- | anttasks/etc/manifest.txt | 1 | ||||
| -rw-r--r-- | anttasks/src/Android.mk | 1 | ||||
| -rw-r--r-- | files/ant/pre_setup.xml | 14 | ||||
| -rw-r--r-- | sdkmanager/libs/sdklib/manifest.txt | 2 | ||||
| -rw-r--r-- | templates/build.template | 23 |
5 files changed, 26 insertions, 15 deletions
diff --git a/anttasks/etc/manifest.txt b/anttasks/etc/manifest.txt new file mode 100644 index 0000000..0d89364 --- /dev/null +++ b/anttasks/etc/manifest.txt @@ -0,0 +1 @@ +Class-Path: sdklib.jar diff --git a/anttasks/src/Android.mk b/anttasks/src/Android.mk index dbaf2bc..5cefb37 100644 --- a/anttasks/src/Android.mk +++ b/anttasks/src/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) +LOCAL_JAR_MANIFEST := ../etc/manifest.txt LOCAL_JAVA_LIBRARIES := \ sdklib \ diff --git a/files/ant/pre_setup.xml b/files/ant/pre_setup.xml new file mode 100644 index 0000000..eee449a --- /dev/null +++ b/files/ant/pre_setup.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="imported" basedir="."> + + <!-- Custom Android task to deal with the project target, and import the + proper rules. + This requires ant 1.6.0 or above. --> + <path id="android.antlibs"> + <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> + </path> + + <taskdef name="setup" + classname="com.android.ant.SetupTask" + classpathref="android.antlibs" /> +</project> diff --git a/sdkmanager/libs/sdklib/manifest.txt b/sdkmanager/libs/sdklib/manifest.txt index 3f6cd85..0ead4fc 100644 --- a/sdkmanager/libs/sdklib/manifest.txt +++ b/sdkmanager/libs/sdklib/manifest.txt @@ -1 +1 @@ -Class-Path: androidprefs.jar commons-compress-1.0.jar +Class-Path: androidprefs.jar common.jar commons-compress-1.0.jar diff --git a/templates/build.template b/templates/build.template index f57adf9..d975bdc 100644 --- a/templates/build.template +++ b/templates/build.template @@ -32,18 +32,10 @@ application and should be checked into Version Control Systems. --> <property file="default.properties" /> - <!-- Custom Android task to deal with the project target, and import the - proper rules. - This requires ant 1.6.0 or above. --> - <path id="android.antlibs"> - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> - </path> - - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> + + <!-- Required pre-setup import --> + <import file="${sdk.dir}/tools/ant/pre_setup.xml" /> + <!-- extension targets. Uncomment the ones where you want to do custom work in between standard targets --> @@ -60,12 +52,15 @@ </target> --> - <!-- Execute the Android Setup task that will setup some properties specific to the target, and import the build rules files. The rules file is imported from - <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml + <SDK>/tools/ant/ + Depending on the project type it can be either: + - main_rules.xml + - lib_rules.xml + - test_rules.xml To customize existing targets, there are two options: - Customize only one target: |