summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author Marcin Kosiba <mkosiba@google.com> 2014-09-11 18:34:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-11 18:34:33 +0000
commita0a946647611ea0477c9a25b3d9621fab4cfaaf3 (patch)
tree0b947292cf390eba3990652671a3554af815dc10 /tools/aapt/Command.cpp
parent3e42b339800f5a3ac840e9545c36f3445b5c64b3 (diff)
parent0f3a5a6559a955ea20f1ae2d3e0995f3fa821c90 (diff)
Merge "Don't use reflection when generating the onResourcesLoaded callback." into lmp-dev
Diffstat (limited to 'tools/aapt/Command.cpp')
-rw-r--r--tools/aapt/Command.cpp3
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;
}