diff options
| author | Marcin Kosiba <mkosiba@google.com> | 2014-09-11 18:44:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 18:44:07 +0000 |
| commit | 48ce27b86dcc48d17410adedb1d612d461cff37c (patch) | |
| tree | 4b8b4017eec1333bb09d2462520f059695b778e8 /tools/aapt/Command.cpp | |
| parent | 3cda1976f2461f2d3684787272b15316ca7cf06e (diff) | |
| parent | a0a946647611ea0477c9a25b3d9621fab4cfaaf3 (diff) | |
am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev
* commit '5128e88e4ad39b407cb36bfd3d81f3f5108e5830':
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 27e60f3b85d7..41d8502c5331 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -2390,7 +2390,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; } |