projects
/
android
/
aapt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."
[android/aapt.git]
/
Package.cpp
diff --git
a/Package.cpp
b/Package.cpp
index c9f687088b4f1afb92b22c22a78ff50c4372fff3..3930117b67a2126a2fca50498cac1a523e01a3db 100644
(file)
--- a/
Package.cpp
+++ b/
Package.cpp
@@
-6,6
+6,7
@@
#include "Main.h"
#include "AaptAssets.h"
#include "ResourceTable.h"
#include "Main.h"
#include "AaptAssets.h"
#include "ResourceTable.h"
+#include "ResourceFilter.h"
#include <utils/Log.h>
#include <utils/threads.h>
#include <utils/Log.h>
#include <utils/threads.h>
@@
-177,12
+178,17
@@
status_t writeAPK(Bundle* bundle, const sp<AaptAssets>& assets,
}
}
}
}
+ // If we've been asked to generate a dependency file for the .ap_ package,
+ // do so here
if (bundle->getGenDependencies()) {
if (bundle->getGenDependencies()) {
- // Add this file to the dependency file
- String8 dependencyFile = outputFile.getBasePath();
+ // The dependency file gets output to the same directory
+ // as the specified output file with an additional .d extension.
+ // e.g. bin/resources.ap_.d
+ String8 dependencyFile = outputFile;
dependencyFile.append(".d");
FILE* fp = fopen(dependencyFile.string(), "a");
dependencyFile.append(".d");
FILE* fp = fopen(dependencyFile.string(), "a");
+ // Add this file to the dependency file
fprintf(fp, "%s \\\n", outputFile.string());
fclose(fp);
}
fprintf(fp, "%s \\\n", outputFile.string());
fclose(fp);
}