Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d35cca9 authored by Yuichi Araki's avatar Yuichi Araki
Browse files

AAPT: Add --no-version-transitions flag 

Add a new flag to disable versioning of Transition related XMLs.
Transition support library will use this to handle these XMLs on older
API levels.

Test: make libaapt_tests AaptTestAppOne
Bug: 34427868
Change-Id: I66e81cca049e71ef6704177b2ca21c9cdeaff78f
parent 9727f22f

tools/aapt/Bundle.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ public: 
          mCompressionMethod(0), mJunkPath(false), mOutputAPKFile(NULL),

          mCompressionMethod(0), mJunkPath(false), mOutputAPKFile(NULL),

          mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL),

          mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL),

          mAutoAddOverlay(false), mGenDependencies(false), mNoVersionVectors(false),

          mAutoAddOverlay(false), mGenDependencies(false), mNoVersionVectors(false),

          mNoVersionTransitions(false),

          mCrunchedOutputDir(NULL), mProguardFile(NULL), mMainDexProguardFile(NULL),

          mCrunchedOutputDir(NULL), mProguardFile(NULL), mMainDexProguardFile(NULL),

          mAndroidManifestFile(NULL), mPublicOutputFile(NULL),

          mAndroidManifestFile(NULL), mPublicOutputFile(NULL),

          mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL),

          mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL),
@@ -219,6 +220,8 @@ public: 
    void setBuildAppAsSharedLibrary(bool val) { mBuildAppAsSharedLibrary = val; }

    void setBuildAppAsSharedLibrary(bool val) { mBuildAppAsSharedLibrary = val; }

    void setNoVersionVectors(bool val) { mNoVersionVectors = val; }

    void setNoVersionVectors(bool val) { mNoVersionVectors = val; }

    bool getNoVersionVectors() const { return mNoVersionVectors; }

    bool getNoVersionVectors() const { return mNoVersionVectors; }

    void setNoVersionTransitions(bool val) { mNoVersionTransitions = val; }

    bool getNoVersionTransitions() const { return mNoVersionTransitions; }





    /*

    /*

     * Set and get the file specification.

     * Set and get the file specification.
@@ -299,6 +302,7 @@ private: 
    bool        mAutoAddOverlay;

    bool        mAutoAddOverlay;

    bool        mGenDependencies;

    bool        mGenDependencies;

    bool        mNoVersionVectors;

    bool        mNoVersionVectors;

    bool        mNoVersionTransitions;

    const char* mCrunchedOutputDir;

    const char* mCrunchedOutputDir;

    const char* mProguardFile;

    const char* mProguardFile;

    const char* mMainDexProguardFile;

    const char* mMainDexProguardFile;

tools/aapt/Main.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,8 @@ void usage(void) 
        "       localization\n"

        "       localization\n"

        "   --no-version-vectors\n"

        "   --no-version-vectors\n"

        "       Do not automatically generate versioned copies of vector XML resources.\n"

        "       Do not automatically generate versioned copies of vector XML resources.\n"

        "   --no-version-transitions\n"

        "       Do not automatically generate versioned copies of transition XML resources.\n"

        "   --private-symbols\n"

        "   --private-symbols\n"

        "       Java package name to use when generating R.java for private resources.\n",

        "       Java package name to use when generating R.java for private resources.\n",

        gDefaultIgnoreAssets);

        gDefaultIgnoreAssets);
@@ -704,6 +706,8 @@ int main(int argc, char* const argv[]) 
                    bundle.setPseudolocalize(PSEUDO_ACCENTED | PSEUDO_BIDI);

                    bundle.setPseudolocalize(PSEUDO_ACCENTED | PSEUDO_BIDI);

                } else if (strcmp(cp, "-no-version-vectors") == 0) {

                } else if (strcmp(cp, "-no-version-vectors") == 0) {

                    bundle.setNoVersionVectors(true);

                    bundle.setNoVersionVectors(true);

                } else if (strcmp(cp, "-no-version-transitions") == 0) {

                    bundle.setNoVersionTransitions(true);

                } else if (strcmp(cp, "-private-symbols") == 0) {

                } else if (strcmp(cp, "-private-symbols") == 0) {

                    argc--;

                    argc--;

                    argv++;

                    argv++;

tools/aapt/ResourceTable.cpp

+31 −0
Original line number Original line Diff line number Diff line
@@ -4730,6 +4730,32 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) { 
    return NO_ERROR;

    return NO_ERROR;

}

}





const String16 kTransitionElements[] = {

    String16("fade"),

    String16("changeBounds"),

    String16("slide"),

    String16("explode"),

    String16("changeImageTransform"),

    String16("changeTransform"),

    String16("changeClipBounds"),

    String16("autoTransition"),

    String16("recolor"),

    String16("changeScroll"),

    String16("transitionSet"),

    String16("transition"),

    String16("transitionManager"),

};



static bool IsTransitionElement(const String16& name) {

    for (int i = 0, size = sizeof(kTransitionElements) / sizeof(kTransitionElements[0]);

         i < size; ++i) {

        if (name == kTransitionElements[i]) {

            return true;

        }

    }

    return false;

}



status_t ResourceTable::modifyForCompat(const Bundle* bundle,

status_t ResourceTable::modifyForCompat(const Bundle* bundle,

                                        const String16& resourceName,

                                        const String16& resourceName,

                                        const sp<AaptFile>& target,

                                        const sp<AaptFile>& target,
@@ -4766,6 +4792,11 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 
            continue;

            continue;

        }

        }





        if (bundle->getNoVersionTransitions() && (IsTransitionElement(node->getElementName()))) {

            // We were told not to version transition tags, so skip the children here.

            continue;

        }



        const Vector<XMLNode::attribute_entry>& attrs = node->getAttributes();

        const Vector<XMLNode::attribute_entry>& attrs = node->getAttributes();

        for (size_t i = 0; i < attrs.size(); i++) {

        for (size_t i = 0; i < attrs.size(); i++) {

            const XMLNode::attribute_entry& attr = attrs[i];

            const XMLNode::attribute_entry& attr = attrs[i];

tools/aapt2/Main.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ namespace aapt { 
static const char* sMajorVersion = "2";

static const char* sMajorVersion = "2";





// Update minor version whenever a feature or flag is added.

// Update minor version whenever a feature or flag is added.

static const char* sMinorVersion = "4";

static const char* sMinorVersion = "5";





int PrintVersion() {

int PrintVersion() {

  std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "."

  std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "."

tools/aapt2/integration-tests/AppOne/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,5 +24,5 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 
LOCAL_STATIC_ANDROID_LIBRARIES := \

LOCAL_STATIC_ANDROID_LIBRARIES := \

    AaptTestStaticLibOne \

    AaptTestStaticLibOne \

    AaptTestStaticLibTwo

    AaptTestStaticLibTwo

LOCAL_AAPT_FLAGS := --no-version-vectors

LOCAL_AAPT_FLAGS := --no-version-vectors --no-version-transitions

include $(BUILD_PACKAGE)
 
include $(BUILD_PACKAGE)