X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/0b27d12badbf3afbd1890fbdc1bc05243c9dfde3..0710566093f5049cf400c25076e0d22828ec11bb:/Bundle.h?ds=inline diff --git a/Bundle.h b/Bundle.h index 9e712b8..d7cb61a 100644 --- a/Bundle.h +++ b/Bundle.h @@ -14,6 +14,18 @@ #include #include +enum { + SDK_CUPCAKE = 3, + SDK_DONUT = 4, + SDK_ECLAIR = 5, + SDK_ECLAIR_0_1 = 6, + SDK_MR1 = 7, + SDK_FROYO = 8, + SDK_HONEYCOMB_MR2 = 13, + SDK_ICE_CREAM_SANDWICH = 14, + SDK_ICE_CREAM_SANDWICH_MR1 = 15, +}; + /* * Things we can do. */ @@ -25,6 +37,7 @@ typedef enum Command { kCommandAdd, kCommandRemove, kCommandPackage, + kCommandCrunch, } Command; /* @@ -37,13 +50,18 @@ public: mForce(false), mGrayscaleTolerance(0), mMakePackageDirs(false), mUpdate(false), mExtending(false), mRequireLocalization(false), mPseudolocalize(false), + mWantUTF16(false), mValues(false), mCompressionMethod(0), mOutputAPKFile(NULL), - mAssetSourceDir(NULL), + mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL), + mAutoAddOverlay(false), mGenDependencies(false), + mAssetSourceDir(NULL), + mCrunchedOutputDir(NULL), mProguardFile(NULL), mAndroidManifestFile(NULL), mPublicOutputFile(NULL), - mRClassDir(NULL), mResourceIntermediatesDir(NULL), + mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL), mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL), - mVersionCode(NULL), mVersionName(NULL), - mArgc(0), mArgv(NULL) + mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL), + mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL), + mUseCrunchCache(false), mArgc(0), mArgv(NULL) {} ~Bundle(void) {} @@ -64,7 +82,7 @@ public: bool getForce(void) const { return mForce; } void setForce(bool val) { mForce = val; } void setGrayscaleTolerance(int val) { mGrayscaleTolerance = val; } - int getGrayscaleTolerance() { return mGrayscaleTolerance; } + int getGrayscaleTolerance() const { return mGrayscaleTolerance; } bool getMakePackageDirs(void) const { return mMakePackageDirs; } void setMakePackageDirs(bool val) { mMakePackageDirs = val; } bool getUpdate(void) const { return mUpdate; } @@ -75,16 +93,37 @@ public: void setRequireLocalization(bool val) { mRequireLocalization = val; } bool getPseudolocalize(void) const { return mPseudolocalize; } void setPseudolocalize(bool val) { mPseudolocalize = val; } + void setWantUTF16(bool val) { mWantUTF16 = val; } + bool getValues(void) const { return mValues; } + void setValues(bool val) { mValues = val; } int getCompressionMethod(void) const { return mCompressionMethod; } void setCompressionMethod(int val) { mCompressionMethod = val; } + bool getJunkPath(void) const { return mJunkPath; } + void setJunkPath(bool val) { mJunkPath = val; } const char* getOutputAPKFile() const { return mOutputAPKFile; } void setOutputAPKFile(const char* val) { mOutputAPKFile = val; } + const char* getManifestPackageNameOverride() const { return mManifestPackageNameOverride; } + void setManifestPackageNameOverride(const char * val) { mManifestPackageNameOverride = val; } + const char* getInstrumentationPackageNameOverride() const { return mInstrumentationPackageNameOverride; } + void setInstrumentationPackageNameOverride(const char * val) { mInstrumentationPackageNameOverride = val; } + bool getAutoAddOverlay() { return mAutoAddOverlay; } + void setAutoAddOverlay(bool val) { mAutoAddOverlay = val; } + bool getGenDependencies() { return mGenDependencies; } + void setGenDependencies(bool val) { mGenDependencies = val; } + + bool getUTF16StringsOption() { + return mWantUTF16 || !isMinSdkAtLeast(SDK_FROYO); + } - /* - * Input options. + /* + * Input options. */ const char* getAssetSourceDir() const { return mAssetSourceDir; } void setAssetSourceDir(const char* dir) { mAssetSourceDir = dir; } + const char* getCrunchedOutputDir() const { return mCrunchedOutputDir; } + void setCrunchedOutputDir(const char* dir) { mCrunchedOutputDir = dir; } + const char* getProguardFile() const { return mProguardFile; } + void setProguardFile(const char* file) { mProguardFile = file; } const android::Vector& getResourceSourceDirs() const { return mResourceSourceDirs; } void addResourceSourceDir(const char* dir) { mResourceSourceDirs.insertAt(dir,0); } const char* getAndroidManifestFile() const { return mAndroidManifestFile; } @@ -95,6 +134,8 @@ public: void setRClassDir(const char* dir) { mRClassDir = dir; } const char* getConfigurations() const { return mConfigurations.size() > 0 ? mConfigurations.string() : NULL; } void addConfigurations(const char* val) { if (mConfigurations.size() > 0) { mConfigurations.append(","); mConfigurations.append(val); } else { mConfigurations = val; } } + const char* getPreferredConfigurations() const { return mPreferredConfigurations.size() > 0 ? mPreferredConfigurations.string() : NULL; } + void addPreferredConfigurations(const char* val) { if (mPreferredConfigurations.size() > 0) { mPreferredConfigurations.append(","); mPreferredConfigurations.append(val); } else { mPreferredConfigurations = val; } } const char* getResourceIntermediatesDir() const { return mResourceIntermediatesDir; } void setResourceIntermediatesDir(const char* dir) { mResourceIntermediatesDir = dir; } const android::Vector& getPackageIncludes() const { return mPackageIncludes; } @@ -104,6 +145,8 @@ public: const android::Vector& getNoCompressExtensions() const { return mNoCompressExtensions; } void addNoCompressExtension(const char* ext) { mNoCompressExtensions.add(ext); } + const char* getManifestMinSdkVersion() const { return mManifestMinSdkVersion; } + void setManifestMinSdkVersion(const char* val) { mManifestMinSdkVersion = val; } const char* getMinSdkVersion() const { return mMinSdkVersion; } void setMinSdkVersion(const char* val) { mMinSdkVersion = val; } const char* getTargetSdkVersion() const { return mTargetSdkVersion; } @@ -114,7 +157,21 @@ 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; } + const char* getExtraPackages() const { return mExtraPackages; } + void setExtraPackages(const char* val) { mExtraPackages = val; } + const char* getMaxResVersion() const { return mMaxResVersion; } + void setMaxResVersion(const char * val) { mMaxResVersion = val; } + bool getDebugMode() const { return mDebugMode; } + void setDebugMode(bool val) { mDebugMode = val; } + bool getNonConstantId() const { return mNonConstantId; } + void setNonConstantId(bool val) { mNonConstantId = val; } + const char* getProduct() const { return mProduct; } + void setProduct(const char * val) { mProduct = val; } + void setUseCrunchCache(bool val) { mUseCrunchCache = val; } + bool getUseCrunchCache() const { return mUseCrunchCache; } + /* * Set and get the file specification. * @@ -142,6 +199,35 @@ public: void setPackageCount(int val) { mPackageCount = val; } #endif + /* Certain features may only be available on a specific SDK level or + * above. SDK levels that have a non-numeric identifier are assumed + * to be newer than any SDK level that has a number designated. + */ + bool isMinSdkAtLeast(int desired) { + /* If the application specifies a minSdkVersion in the manifest + * then use that. Otherwise, check what the user specified on + * the command line. If neither, it's not available since + * the minimum SDK version is assumed to be 1. + */ + const char *minVer; + if (mManifestMinSdkVersion != NULL) { + minVer = mManifestMinSdkVersion; + } else if (mMinSdkVersion != NULL) { + minVer = mMinSdkVersion; + } else { + return false; + } + + char *end; + int minSdkNum = (int)strtol(minVer, &end, 0); + if (*end == '\0') { + if (minSdkNum < desired) { + return false; + } + } + return true; + } + private: /* commands & modifiers */ Command mCmd; @@ -154,25 +240,43 @@ private: bool mExtending; bool mRequireLocalization; bool mPseudolocalize; + bool mWantUTF16; + bool mValues; int mCompressionMethod; + bool mJunkPath; const char* mOutputAPKFile; + const char* mManifestPackageNameOverride; + const char* mInstrumentationPackageNameOverride; + bool mAutoAddOverlay; + bool mGenDependencies; const char* mAssetSourceDir; + const char* mCrunchedOutputDir; + const char* mProguardFile; const char* mAndroidManifestFile; const char* mPublicOutputFile; const char* mRClassDir; const char* mResourceIntermediatesDir; android::String8 mConfigurations; + android::String8 mPreferredConfigurations; android::Vector mPackageIncludes; android::Vector mJarFiles; android::Vector mNoCompressExtensions; android::Vector mResourceSourceDirs; - + + const char* mManifestMinSdkVersion; const char* mMinSdkVersion; const char* mTargetSdkVersion; const char* mMaxSdkVersion; const char* mVersionCode; const char* mVersionName; - + const char* mCustomPackage; + const char* mExtraPackages; + const char* mMaxResVersion; + bool mDebugMode; + bool mNonConstantId; + const char* mProduct; + bool mUseCrunchCache; + /* file specification */ int mArgc; char* const* mArgv; @@ -181,6 +285,7 @@ private: /* misc stuff */ int mPackageCount; #endif + }; #endif // __BUNDLE_H