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

Commit cb6c3f9b authored by Shane Farmer's avatar Shane Farmer
Browse files

AAPT2: Push more configuration code into the parser 

When parsing is complete, we now have a list of output artifacts that
have their referential integrity validated. This means that once the
configuration file is parsed, the only errors that can occur are related
to APK processing, and not the configuration itself.

This reduces the number of errors that could cause a partial output of
APK artifacts. It simplifies the public API and reduces the complexity of
the code to generate multiple APKs.

Test: Ran unit tests
Test: manually ran the optimize command to ensure it still works

Change-Id: I3f2d885b207a84c958f5348a4baa6718598184a4
parent ff38f236

tools/aapt2/cmd/Optimize.cpp

+15 −21
Original line number Original line Diff line number Diff line
@@ -44,8 +44,7 @@ 
#include "util/Util.h"

#include "util/Util.h"





using ::aapt::configuration::Abi;

using ::aapt::configuration::Abi;

using ::aapt::configuration::Artifact;

using ::aapt::configuration::OutputArtifact;

using ::aapt::configuration::PostProcessingConfiguration;

using ::android::ResTable_config;

using ::android::ResTable_config;

using ::android::StringPiece;

using ::android::StringPiece;

using ::android::base::ReadFileToString;

using ::android::base::ReadFileToString;
@@ -74,7 +73,7 @@ struct OptimizeOptions { 




  TableFlattenerOptions table_flattener_options;

  TableFlattenerOptions table_flattener_options;





  Maybe<PostProcessingConfiguration> configuration;

  Maybe<std::vector<OutputArtifact>> apk_artifacts;





  // Set of artifacts to keep when generating multi-APK splits. If the list is empty, all artifacts

  // Set of artifacts to keep when generating multi-APK splits. If the list is empty, all artifacts

  // are kept and will be written as output.

  // are kept and will be written as output.
@@ -199,14 +198,11 @@ class OptimizeCommand { 
      ++split_constraints_iter;

      ++split_constraints_iter;

    }

    }





    if (options_.configuration && options_.output_dir) {

    if (options_.apk_artifacts && options_.output_dir) {

      MultiApkGenerator generator{apk.get(), context_};

      MultiApkGenerator generator{apk.get(), context_};

      MultiApkGeneratorOptions generator_options = {

      MultiApkGeneratorOptions generator_options = {

          options_.output_dir.value(),

          options_.output_dir.value(), options_.apk_artifacts.value(),

          options_.configuration.value(),

          options_.table_flattener_options, options_.kept_artifacts};

          options_.table_flattener_options,

          options_.kept_artifacts,

      };

      if (!generator.FromBaseApk(generator_options)) {

      if (!generator.FromBaseApk(generator_options)) {

        return 1;

        return 1;

      }

      }
@@ -423,29 +419,27 @@ int Optimize(const std::vector<StringPiece>& args) { 
    std::string& path = config_path.value();

    std::string& path = config_path.value();

    Maybe<ConfigurationParser> for_path = ConfigurationParser::ForPath(path);

    Maybe<ConfigurationParser> for_path = ConfigurationParser::ForPath(path);

    if (for_path) {

    if (for_path) {

      options.configuration = for_path.value().WithDiagnostics(diag).Parse();

      options.apk_artifacts = for_path.value().WithDiagnostics(diag).Parse(apk_path);

    } else {

      if (!options.apk_artifacts) {

      diag->Error(DiagMessage() << "Could not parse config file " << path);

        diag->Error(DiagMessage() << "Failed to parse the output artifact list");

        return 1;

        return 1;

      }

      }





    if (print_only) {

    } else {

      std::vector<std::string> names;

      diag->Error(DiagMessage() << "Could not parse config file " << path);

      const PostProcessingConfiguration& config = options.configuration.value();

      if (!config.AllArtifactNames(file::GetFilename(apk_path), &names, diag)) {

        diag->Error(DiagMessage() << "Failed to generate output artifact list");

      return 1;

      return 1;

    }

    }





      for (const auto& name : names) {

    if (print_only) {

        std::cout << name << std::endl;

      for (const OutputArtifact& artifact : options.apk_artifacts.value()) {

        std::cout << artifact.name << std::endl;

      }

      }

      return 0;

      return 0;

    }

    }





    if (!kept_artifacts.empty()) {

    if (!kept_artifacts.empty()) {

      for (const auto& artifact_str : kept_artifacts) {

      for (const std::string& artifact_str : kept_artifacts) {

        for (const auto& artifact : util::Tokenize(artifact_str, ',')) {

        for (const StringPiece& artifact : util::Tokenize(artifact_str, ',')) {

          options.kept_artifacts.insert(artifact.to_string());

          options.kept_artifacts.insert(artifact.to_string());

        }

        }

      }

      }

tools/aapt2/configuration/ConfigurationParser.cpp

+246 −119

File changed.

Preview size limit exceeded, changes collapsed.

tools/aapt2/configuration/ConfigurationParser.h

+12 −90

File changed.

Preview size limit exceeded, changes collapsed.

tools/aapt2/configuration/ConfigurationParser.internal.h

0 → 100644
+122 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/aapt2/configuration/ConfigurationParser_test.cpp

+74 −68

File changed.

Preview size limit exceeded, changes collapsed.