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

Commit 82dad75c authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am: b97d51a0 

am: 48d5b688

Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
parents 52a29573 48d5b688

tools/aapt2/cmd/Link.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -1873,7 +1873,8 @@ int Link(const std::vector<StringPiece>& args) { 
                            &options.extensions_to_not_compress)

                            &options.extensions_to_not_compress)

          .OptionalFlagList("--split",

          .OptionalFlagList("--split",

                            "Split resources matching a set of configs out to a Split APK.\n"

                            "Split resources matching a set of configs out to a Split APK.\n"

                            "Syntax: path/to/output.apk:<config>[,<config>[...]].",

                            "Syntax: path/to/output.apk:<config>[,<config>[...]].\n"

                            "On Windows, use a semicolon ';' separator instead.",

                            &split_args)

                            &split_args)

          .OptionalSwitch("-v", "Enables verbose logging.", &verbose);

          .OptionalSwitch("-v", "Enables verbose logging.", &verbose);

tools/aapt2/cmd/Optimize.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -302,7 +302,8 @@ int Optimize(const std::vector<StringPiece>& args) { 
                            &configs)

                            &configs)

          .OptionalFlagList("--split",

          .OptionalFlagList("--split",

                            "Split resources matching a set of configs out to a "

                            "Split resources matching a set of configs out to a "

                            "Split APK.\nSyntax: path/to/output.apk:<config>[,<config>[...]].",

                            "Split APK.\nSyntax: path/to/output.apk;<config>[,<config>[...]].\n"

                            "On Windows, use a semicolon ';' separator instead.",

                            &split_args)

                            &split_args)

          .OptionalSwitch("--enable-sparse-encoding",

          .OptionalSwitch("--enable-sparse-encoding",

                          "Enables encoding sparse entries using a binary search tree.\n"

                          "Enables encoding sparse entries using a binary search tree.\n"

tools/aapt2/cmd/Util.cpp

+9 −2
Original line number Original line Diff line number Diff line
@@ -57,10 +57,17 @@ bool ParseSplitParameter(const StringPiece& arg, IDiagnostics* diag, std::string 
  CHECK(out_path != nullptr);

  CHECK(out_path != nullptr);

  CHECK(out_split != nullptr);

  CHECK(out_split != nullptr);





  std::vector<std::string> parts = util::Split(arg, ':');

#ifdef _WIN32

  const char sSeparator = ';';

#else

  const char sSeparator = ':';

#endif



  std::vector<std::string> parts = util::Split(arg, sSeparator);

  if (parts.size() != 2) {

  if (parts.size() != 2) {

    diag->Error(DiagMessage() << "invalid split parameter '" << arg << "'");

    diag->Error(DiagMessage() << "invalid split parameter '" << arg << "'");

    diag->Note(DiagMessage() << "should be --split path/to/output.apk:<config>[,<config>...]");

    diag->Note(DiagMessage() << "should be --split path/to/output.apk" << sSeparator

                             << "<config>[,<config>...].");

    return false;

    return false;

  }

  }