diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-13 17:23:17 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-09-18 18:58:44 -0700 |
| commit | aea408b68a6f833327b6e0954a28f414f58133ac (patch) | |
| tree | 2c35517f590aa02872165dc80b6b080b355fb25a /files | |
| parent | ba21bdb94f3b988443c0b16b44df97969eaab60c (diff) | |
| download | sdk-aea408b68a6f833327b6e0954a28f414f58133ac.zip sdk-aea408b68a6f833327b6e0954a28f414f58133ac.tar.gz sdk-aea408b68a6f833327b6e0954a28f414f58133ac.tar.bz2 | |
Generate smaller R classes for libraries.
Using the new --output-text-symbols from aapt the build
system now generates the R class for libraries manually
based on the symbols exported by the libraries and the
final values computed by aapt when using all the resource
folders.
Because only R.java is concerned, the Manifest class is
now included in the library jar file.
Also added a new test apps that uses instrumentation to
verify the build system.
Change-Id: Ic436ea8eb070844e9db8b3b2620fbf665839d40b
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 0c486e6..a1e9daa 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -551,6 +551,7 @@ libraryManifestFilePathOut="project.library.manifest.file.path" libraryResFolderPathOut="project.library.res.folder.path" libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path" + libraryRFilePathOut="project.library.bin.r.file.path" libraryNativeFolderPathOut="project.library.native.folder.path" jarLibraryPathOut="project.all.jars.path" targetApi="${project.target.apilevel}" @@ -665,7 +666,9 @@ nonConstantId="${android.library}" libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" + libraryRFileRefid="project.library.bin.r.file.path" ignoreAssets="${aapt.ignore.assets}" + binFolder="${out.absolute.dir}" proguardFile="${out.absolute.dir}/proguard.txt"> <res path="${out.res.absolute.dir}" /> <res path="${resource.absolute.dir}" /> @@ -914,6 +917,7 @@ resourcefilter="${aapt.resource.filter}" libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" + libraryRFileRefid="project.library.bin.r.file.path" previousBuildType="${build.last.target}" buildType="${build.target}" ignoreAssets="${aapt.ignore.assets}"> |