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

Commit e1795d44 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... 

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

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



Change-Id: I5bbd7af31f6b92789a05d181fc55792c2c1aa579
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a09c239b bc876a99

tools/aapt2/cmd/Link.h

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

        &options_.merge_only);

    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;
@@ -347,6 +348,7 @@ class LinkCommand : public Command { 
  std::optional<std::string> stable_id_file_path_;

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

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

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

};



}// namespace aapt