diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-12-10 17:53:27 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-12-10 17:53:27 -0800 |
| commit | a5a8cc13d3f906650a1eb17e20e1b26d68b78453 (patch) | |
| tree | 656976c8ca4d5a7c096119a3e087770651c3009c /tools/aapt/Bundle.h | |
| parent | 7b0463a949b57620680b95e45c66a05f67426b74 (diff) | |
| parent | ce307f889b509143899a2221359219fbc91b618c (diff) | |
| download | frameworks_base-a5a8cc13d3f906650a1eb17e20e1b26d68b78453.zip frameworks_base-a5a8cc13d3f906650a1eb17e20e1b26d68b78453.tar.gz frameworks_base-a5a8cc13d3f906650a1eb17e20e1b26d68b78453.tar.bz2 | |
resolved conflicts for merge of ce307f88 to eclair-mr2
Diffstat (limited to 'tools/aapt/Bundle.h')
| -rw-r--r-- | tools/aapt/Bundle.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ public: 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 @@ public: 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 @@ private: const char* mMaxSdkVersion; const char* mVersionCode; const char* mVersionName; + const char* mCustomPackage; /* file specification */ int mArgc; |