drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread

Browse Source 
Merge commit '2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp

* commit '2382755730206da52b64bf7bd2fad421f9a6fd0d':
  Add a --debug-mode option to aapt.
This commit is contained in:
Xavier Ducrohet
2010-08-31 14:32:53 -07:00
committed by Android Git Automerger
parent b7ab342016 2382755730
commit b4649ec720
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt/Bundle.h
View File

@ -45,7 +45,7 @@ public:
mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL), mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL),
mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL), mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL),
mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL),
mMaxResVersion(NULL), mMaxResVersion(NULL), mDebugMode(false),
mArgc(0), mArgv(NULL) mArgc(0), mArgv(NULL)
{} {}
~Bundle(void) {} ~Bundle(void) {}
@ -137,6 +137,8 @@ public:
void setCustomPackage(const char* val) { mCustomPackage = val; } void setCustomPackage(const char* val) { mCustomPackage = val; }
const char* getMaxResVersion() const { return mMaxResVersion; } const char* getMaxResVersion() const { return mMaxResVersion; }
void setMaxResVersion(const char * val) { mMaxResVersion = val; } void setMaxResVersion(const char * val) { mMaxResVersion = val; }
bool getDebugMode() { return mDebugMode; }
void setDebugMode(bool val) { mDebugMode = val; }
/* /*
* Set and get the file specification. * Set and get the file specification.
@ -234,6 +236,7 @@ private:
const char* mVersionName; const char* mVersionName;
const char* mCustomPackage; const char* mCustomPackage;
const char* mMaxResVersion; const char* mMaxResVersion;
bool mDebugMode;
/* file specification */ /* file specification */
int mArgc; int mArgc;

9
tools/aapt/Main.cpp
View File

@ -57,7 +57,7 @@ void usage(void)
fprintf(stderr, fprintf(stderr,
" %s p[ackage] [-d][-f][-m][-u][-v][-x][-z][-M AndroidManifest.xml] \\\n" " %s p[ackage] [-d][-f][-m][-u][-v][-x][-z][-M AndroidManifest.xml] \\\n"
" [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n" " [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n"
" [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n" " [--debug-mode] [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n"
" [--app-version VAL] [--app-version-name TEXT] [--custom-package VAL] \\\n" " [--app-version VAL] [--app-version-name TEXT] [--custom-package VAL] \\\n"
" [--rename-manifest-package PACKAGE] \\\n" " [--rename-manifest-package PACKAGE] \\\n"
" [--rename-instrumentation-target-package PACKAGE] \\\n" " [--rename-instrumentation-target-package PACKAGE] \\\n"
@ -124,6 +124,9 @@ void usage(void)
" -0 specifies an additional extension for which such files will not\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" " be stored compressed in the .apk. An empty string means to not\n"
" compress any files at all.\n" " compress any files at all.\n"
" --debug-mode\n"
" inserts android:debuggable=\"true\" in to the application node of the\n"
" manifest, making the application debuggable even on production devices.\n"
" --min-sdk-version\n" " --min-sdk-version\n"
" inserts android:minSdkVersion in to manifest. If the version is 7 or\n" " inserts android:minSdkVersion in to manifest. If the version is 7 or\n"
" higher, the default encoding for resources will be in UTF-8.\n" " higher, the default encoding for resources will be in UTF-8.\n"
@ -392,7 +395,9 @@ int main(int argc, char* const argv[])
} }
break; break;
case '-': case '-':
if (strcmp(cp, "-min-sdk-version") == 0) { if (strcmp(cp, "-debug-mode") == 0) {
bundle.setDebugMode(true);
} else if (strcmp(cp, "-min-sdk-version") == 0) {
argc--; argc--;
argv++; argv++;
if (!argc) { if (!argc) {

7
tools/aapt/Resource.cpp
View File

@ -678,6 +678,13 @@ status_t massageManifest(Bundle* bundle, sp<XMLNode> root)
bundle->getMaxSdkVersion()); bundle->getMaxSdkVersion());
} }
if (bundle->getDebugMode()) {
sp<XMLNode> application = root->getChildElement(String16(), String16("application"));
if (application != NULL) {
addTagAttribute(application, RESOURCES_ANDROID_NAMESPACE, "debuggable", "true");
}
}
// Deal with manifest package name overrides // Deal with manifest package name overrides
const char* manifestPackageNameOverride = bundle->getManifestPackageNameOverride(); const char* manifestPackageNameOverride = bundle->getManifestPackageNameOverride();
if (manifestPackageNameOverride != NULL) { if (manifestPackageNameOverride != NULL) {