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

Commit a68cf3c4 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Add -x and -z flags to minimize changes in build scripts"

parents b7cf50cb 8900aa8b

tools/aapt2/link/Link.cpp

+6 −0
Original line number Diff line number Diff line
@@ -907,6 +907,8 @@ int link(const std::vector<StringPiece>& args) { 
    Maybe<std::string> versionCode, versionName;

    Maybe<std::string> customJavaPackage;

    std::vector<std::string> extraJavaPackages;

    bool legacyXFlag = false;

    bool requireLocalization = false;

    Flags flags = Flags()

            .requiredFlag("-o", "Output path", &options.outputPath)

            .requiredFlag("--manifest", "Path to the Android manifest to build",
@@ -922,6 +924,10 @@ int link(const std::vector<StringPiece>& args) { 
            .optionalSwitch("--no-auto-version",

                            "Disables automatic style and layout SDK versioning",

                            &options.noAutoVersion)

            .optionalSwitch("-x", "Legacy flag that specifies to use the package identifier 0x01",

                            &legacyXFlag)

            .optionalSwitch("-z", "Require localization of strings marked 'suggested'",

                            &requireLocalization)

            .optionalSwitch("--output-to-dir", "Outputs the APK contents to a directory specified "

                            "by -o",

                            &options.outputToDirectory)