Fix Android packaging on newest SDK releases. Google removed paths to several tools in build.xml.

#ue4
#android
#codereview Josh.Adams

[CL 2593642 by Chris Babcock in Main branch]
This commit is contained in:
Chris Babcock
2015-06-19 11:49:05 -04:00
committed by Chris.Babcock@epicgames.com
parent c1d202386d
commit 2f1e4b2704
3 changed files with 60 additions and 0 deletions

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="custom_rules" default="debug">
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
<path id="android.antlibs">
<pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
</path>
<!-- Custom tasks -->
<taskdef resource="anttasks.properties" classpathref="android.antlibs" />
<getbuildtools name="android.build.tools.dir" verbose="${verbose}" />
<property name="aapt" location="${android.build.tools.dir}/aapt" />
<property name="aidl" location="${android.build.tools.dir}/aidl" />
<property name="dx" location="${android.build.tools.dir}/dx.bat" />
<property name="zipalign" location="${android.build.tools.dir}/zipalign" />
</project>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="custom_rules" default="debug">
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
<path id="android.antlibs">
<pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
</path>
<!-- Custom tasks -->
<taskdef resource="anttasks.properties" classpathref="android.antlibs" />
<getbuildtools name="android.build.tools.dir" verbose="${verbose}" />
<property name="aapt" location="${android.build.tools.dir}/aapt" />
<property name="aidl" location="${android.build.tools.dir}/aidl" />
<property name="dx" location="${android.build.tools.dir}/dx.bat" />
<property name="zipalign" location="${android.build.tools.dir}/zipalign" />
</project>