diff options
| author | Marcin Kosiba <mkosiba@google.com> | 2014-09-11 18:49:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 18:49:07 +0000 |
| commit | 0bdcb84b55bd94843081ba45e95256e0655e99b7 (patch) | |
| tree | 65378c8662d8263a98b596eaeb2052fad98de466 /tools/aapt/Command.cpp | |
| parent | a28bfe3b9c9de05dd13dc73ebf140dae35cf567f (diff) | |
| parent | 48ce27b86dcc48d17410adedb1d612d461cff37c (diff) | |
am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev
* commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8':
Don't use reflection when generating the onResourcesLoaded callback.
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 0b11c9323c19..bc0d3ee2a66a 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -2383,7 +2383,8 @@ 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, false); + err = writeResourceSymbols(bundle, assets, String8(packageString), true, + bundle->getBuildSharedLibrary()); if (err < 0) { goto bail; } |