diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 14:47:28 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-08-25 20:04:07 -0700 |
commit | 1e466385d4a4f1acee080fa0fdf16cc8fd8ce7ca (patch) | |
tree | 431c15e17f780767289dc5d3362d5d6d53ee3c18 /tools/aapt/Command.cpp | |
parent | 5b8e5a7d4c930b42e1a3c2b3e67144b89d37efa2 (diff) | |
download | frameworks_base-1e466385d4a4f1acee080fa0fdf16cc8fd8ce7ca.zip frameworks_base-1e466385d4a4f1acee080fa0fdf16cc8fd8ce7ca.tar.gz frameworks_base-1e466385d4a4f1acee080fa0fdf16cc8fd8ce7ca.tar.bz2 |
Have R classes generate their own reference rewrite logic
Change-Id: I0e5b8311fc3479d966a49f9acf0d4c32a6a024d3
Diffstat (limited to 'tools/aapt/Command.cpp')
-rw-r--r-- | tools/aapt/Command.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index b394671..a0f0a08 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -2488,10 +2488,12 @@ int doPackage(Bundle* bundle) if (bundle->getCustomPackage() == NULL) { // Write the R.java file into the appropriate class directory // e.g. gen/com/foo/app/R.java - err = writeResourceSymbols(bundle, assets, assets->getPackage(), true); + err = writeResourceSymbols(bundle, assets, assets->getPackage(), true, + bundle->getBuildSharedLibrary()); } else { const String8 customPkg(bundle->getCustomPackage()); - err = writeResourceSymbols(bundle, assets, customPkg, true); + err = writeResourceSymbols(bundle, assets, customPkg, true, + bundle->getBuildSharedLibrary()); } if (err < 0) { goto bail; @@ -2505,7 +2507,7 @@ int doPackage(Bundle* bundle) char* packageString = strtok(libs.lockBuffer(libs.length()), ":"); while (packageString != NULL) { // Write the R.java file out with the correct package name - err = writeResourceSymbols(bundle, assets, String8(packageString), true); + err = writeResourceSymbols(bundle, assets, String8(packageString), true, false); if (err < 0) { goto bail; } @@ -2514,11 +2516,11 @@ int doPackage(Bundle* bundle) libs.unlockBuffer(); } } else { - err = writeResourceSymbols(bundle, assets, assets->getPackage(), false); + err = writeResourceSymbols(bundle, assets, assets->getPackage(), false, false); if (err < 0) { goto bail; } - err = writeResourceSymbols(bundle, assets, assets->getSymbolsPrivatePackage(), true); + err = writeResourceSymbols(bundle, assets, assets->getSymbolsPrivatePackage(), true, false); if (err < 0) { goto bail; } |