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

Commit ea23cb3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[aapt2] Add placeholder --feature-flags flag" into main am: 28226eec 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2806055



Change-Id: I86a8d09e7910e2ac17f667dc6917dbd37015dc4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b002010 28226eec

tools/aapt2/cmd/Link.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ class LinkCommand : public Command { 
            "should only be used together with the --static-lib flag.",

            "should only be used together with the --static-lib flag.",

        &options_.merge_only);

        &options_.merge_only);

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

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

    AddOptionalFlagList("--feature-flags", "Placeholder, to be implemented.", &feature_flags_args_);

  }

  }





  int Action(const std::vector<std::string>& args) override;

  int Action(const std::vector<std::string>& args) override;
@@ -347,6 +348,7 @@ class LinkCommand : public Command { 
  std::optional<std::string> stable_id_file_path_;

  std::optional<std::string> stable_id_file_path_;

  std::vector<std::string> split_args_;

  std::vector<std::string> split_args_;

  std::optional<std::string> trace_folder_;

  std::optional<std::string> trace_folder_;

  std::vector<std::string> feature_flags_args_;

};

};





}// namespace aapt

}// namespace aapt