diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-01 09:53:48 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-01 09:54:38 -0700 |
| commit | 39b58ba2b299e1c97e13535aae9add530d942c7b (patch) | |
| tree | 94247b9025407767a527abeded5c8cfebfabe1cb /tools/aapt/Bundle.h | |
| parent | a43d2589b1ce657d8af7702cd7b3e3114e7ae133 (diff) | |
| parent | bc2fb7b92e013779356c16685a388d5cdae6e93d (diff) | |
| download | frameworks_base-39b58ba2b299e1c97e13535aae9add530d942c7b.zip frameworks_base-39b58ba2b299e1c97e13535aae9add530d942c7b.tar.gz frameworks_base-39b58ba2b299e1c97e13535aae9add530d942c7b.tar.bz2 | |
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
Diffstat (limited to 'tools/aapt/Bundle.h')
| -rw-r--r-- | tools/aapt/Bundle.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/aapt/Bundle.h b/tools/aapt/Bundle.h index daeadc0..d7cb61a 100644 --- a/tools/aapt/Bundle.h +++ b/tools/aapt/Bundle.h @@ -53,7 +53,6 @@ public: mWantUTF16(false), mValues(false), mCompressionMethod(0), mOutputAPKFile(NULL), mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL), - mIsOverlayPackage(false), mAutoAddOverlay(false), mGenDependencies(false), mAssetSourceDir(NULL), mCrunchedOutputDir(NULL), mProguardFile(NULL), @@ -107,8 +106,6 @@ public: void setManifestPackageNameOverride(const char * val) { mManifestPackageNameOverride = val; } const char* getInstrumentationPackageNameOverride() const { return mInstrumentationPackageNameOverride; } void setInstrumentationPackageNameOverride(const char * val) { mInstrumentationPackageNameOverride = val; } - bool getIsOverlayPackage() const { return mIsOverlayPackage; } - void setIsOverlayPackage(bool val) { mIsOverlayPackage = val; } bool getAutoAddOverlay() { return mAutoAddOverlay; } void setAutoAddOverlay(bool val) { mAutoAddOverlay = val; } bool getGenDependencies() { return mGenDependencies; } @@ -250,7 +247,6 @@ private: const char* mOutputAPKFile; const char* mManifestPackageNameOverride; const char* mInstrumentationPackageNameOverride; - bool mIsOverlayPackage; bool mAutoAddOverlay; bool mGenDependencies; const char* mAssetSourceDir; |