diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-06-01 18:28:08 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-06-05 14:41:24 -0700 |
| commit | 665f681e4881a7472f8ebcb7c4fb9a6771aada29 (patch) | |
| tree | 74e5b5a85b6d6ee61e53d9e596b0d07db0c3902b /files | |
| parent | ea3f581acc01a02550df1137b3adcd8ea5755852 (diff) | |
| download | sdk-665f681e4881a7472f8ebcb7c4fb9a6771aada29.zip sdk-665f681e4881a7472f8ebcb7c4fb9a6771aada29.tar.gz sdk-665f681e4881a7472f8ebcb7c4fb9a6771aada29.tar.bz2 | |
Projects can now access aidl files from their libraries.
Library projects now copy their aidl files into bin/aidl.
Aidl is now called with this import path for all referenced
library projects.
Also added a test project.
Change-Id: I7f94489e87450be67a16ed7198f85b8b472f5025
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index cd1bc7d..542943e 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -124,6 +124,7 @@ <property name="out.absolute.dir" location="${out.dir}" /> <property name="out.classes.absolute.dir" location="${out.dir}/classes" /> <property name="out.res.absolute.dir" location="${out.dir}/res" /> + <property name="out.aidl.absolute.dir" location="${out.dir}/aidl" /> <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" /> <!-- tools location --> @@ -538,6 +539,7 @@ libraryPackagesOut="project.library.packages" libraryManifestFilePathOut="project.library.manifest.file.path" libraryResFolderPathOut="project.library.res.folder.path" + libraryBinFolderPathOut="project.library.bin.folder.path" libraryNativeFolderPathOut="project.library.native.folder.path" jarLibraryPathOut="project.all.jars.path" targetApi="${project.target.apilevel}" @@ -618,8 +620,11 @@ <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping aidl/renderscript/R.java"> <echo level="info">Handling aidl files...</echo> - <aidl executable="${aidl}" framework="${project.target.framework.aidl}" - genFolder="${gen.absolute.dir}"> + <aidl executable="${aidl}" + framework="${project.target.framework.aidl}" + libraryBinFolderPathRefid="project.library.bin.folder.path" + genFolder="${gen.absolute.dir}" + aidlOutFolder="${out.aidl.absolute.dir}"> <source path="${source.absolute.dir}"/> </aidl> |