resolved conflicts for merge of ce307f88 to eclair-mr2
diff --git a/tools/aapt/Bundle.h b/tools/aapt/Bundle.h
index cf70121..4737f84 100644
--- a/tools/aapt/Bundle.h
+++ b/tools/aapt/Bundle.h
@@ -43,7 +43,7 @@
mAndroidManifestFile(NULL), mPublicOutputFile(NULL),
mRClassDir(NULL), mResourceIntermediatesDir(NULL),
mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL),
- mVersionCode(NULL), mVersionName(NULL),
+ mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL),
mArgc(0), mArgv(NULL)
{}
~Bundle(void) {}
@@ -123,6 +123,8 @@
void setVersionCode(const char* val) { mVersionCode = val; }
const char* getVersionName() const { return mVersionName; }
void setVersionName(const char* val) { mVersionName = val; }
+ const char* getCustomPackage() const { return mCustomPackage; }
+ void setCustomPackage(const char* val) { mCustomPackage = val; }
/*
* Set and get the file specification.
@@ -185,6 +187,7 @@
const char* mMaxSdkVersion;
const char* mVersionCode;
const char* mVersionName;
+ const char* mCustomPackage;
/* file specification */
int mArgc;
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index ff9cc11..970a381 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1152,7 +1152,12 @@
// Write out R.java constants
if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {
- err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+ if (bundle->getCustomPackage() == NULL) {
+ err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+ } else {
+ const String8 customPkg(bundle->getCustomPackage());
+ err = writeResourceSymbols(bundle, assets, customPkg, true);
+ }
if (err < 0) {
goto bail;
}
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index bd03b74..efbb2f7 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -59,7 +59,7 @@
" [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n"
" [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n"
" [--max-sdk-version VAL] [--app-version VAL] \\\n"
- " [--app-version-name TEXT]\\\n"
+ " [--app-version-name TEXT] [--custom-package VAL] \\\n"
" [-I base-package [-I base-package ...]] \\\n"
" [-A asset-source-dir] [-G class-list-file] [-P public-definitions-file] \\\n"
" [-S resource-sources [-S resource-sources ...]] "
@@ -116,8 +116,8 @@
" -J specify where to output R.java resource constant definitions\n"
" -M specify full path to AndroidManifest.xml to include in zip\n"
" -P specify where to output public resource definitions\n"
- " -S directory in which to find resources. Multiple directories will be scanned"
- " and the first match found (left to right) will take precedence."
+ " -S directory in which to find resources. Multiple directories will be scanned\n"
+ " and the first match found (left to right) will take precedence.\n"
" -8 Encode string resources in UTF-8.\n"
" -0 specifies an additional extension for which such files will not\n"
" be stored compressed in the .apk. An empty string means to not\n"
@@ -133,7 +133,9 @@
" --version-code\n"
" inserts android:versionCode in to manifest.\n"
" --version-name\n"
- " inserts android:versionName in to manifest.\n");
+ " inserts android:versionName in to manifest.\n"
+ " --custom-package\n"
+ " generates R.java into a different package.\n");
}
/*
@@ -422,6 +424,15 @@
bundle.setVersionName(argv[0]);
} else if (strcmp(cp, "-values") == 0) {
bundle.setValues(true);
+ } else if (strcmp(cp, "-custom-package") == 0) {
+ argc--;
+ argv++;
+ if (!argc) {
+ fprintf(stderr, "ERROR: No argument supplied for '--custom-package' option\n");
+ wantUsage = true;
+ goto bail;
+ }
+ bundle.setCustomPackage(argv[0]);
} else {
fprintf(stderr, "ERROR: Unknown option '-%s'\n", cp);
wantUsage = true;