diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-03-30 09:29:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-30 09:29:50 -0700 |
| commit | 6d42ec51f096747145b420f04934c8f234f32762 (patch) | |
| tree | f2cf21a1336f6d78a65817a706dc2e0a744185f7 /files | |
| parent | d22e798547d802878ac35470b2a64f4a40497c45 (diff) | |
| parent | 767262f720a14928dc934b26d0f763cdb70fe5ac (diff) | |
| download | sdk-6d42ec51f096747145b420f04934c8f234f32762.zip sdk-6d42ec51f096747145b420f04934c8f234f32762.tar.gz sdk-6d42ec51f096747145b420f04934c8f234f32762.tar.bz2 | |
am 767262f7: am 0738ab16: Merge "Add \'asset.dir\' property to build.xml"
* commit '767262f720a14928dc934b26d0f763cdb70fe5ac':
Add 'asset.dir' property to build.xml
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 830919f..7d2a6d7 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -141,7 +141,8 @@ <property name="source.absolute.dir" location="${source.dir}" /> <property name="gen.absolute.dir" location="gen" /> <property name="resource.absolute.dir" location="res" /> - <property name="asset.absolute.dir" location="assets" /> + <property name="asset.dir" value="assets" /> + <property name="asset.absolute.dir" location="${asset.dir}" /> <property name="jar.libs.dir" value="libs" /> <property name="jar.libs.absolute.dir" location="${jar.libs.dir}" /> <property name="native.libs.absolute.dir" location="libs" /> |