From 9266c558bf1d21ff647525ff99f7dadbca417309 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 15 Jan 2009 16:12:10 -0800 Subject: auto import from //branches/cupcake/...@126645 --- tools/aapt/Command.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/aapt/Command.cpp') diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 9f75d4bec4ad..bff0423c45c5 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -761,7 +761,7 @@ int doPackage(Bundle* bundle) } N = bundle->getFileSpecCount(); - if (N < 1 && bundle->getResourceSourceDir() == NULL && bundle->getJarFiles().size() == 0 + if (N < 1 && bundle->getResourceSourceDirs().size() == 0 && bundle->getJarFiles().size() == 0 && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) { fprintf(stderr, "ERROR: no input files\n"); goto bail; @@ -793,7 +793,7 @@ int doPackage(Bundle* bundle) } // If they asked for any files that need to be compiled, do so. - if (bundle->getResourceSourceDir() || bundle->getAndroidManifestFile()) { + if (bundle->getResourceSourceDirs().size() || bundle->getAndroidManifestFile()) { err = buildResources(bundle, assets); if (err != 0) { goto bail; -- cgit v1.2.3-59-g8ed1b