summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-10-26 21:06:48 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-10-26 21:06:48 +0000
commit28226eec72c65a3b6084980dadb886e9bb4a3142 (patch)
treeb6a7007a2f0a9d666865cde17b6f3d80a134cfbf
parent0f5e85a7a431aca17751401c8bf012133cb5e2c8 (diff)
parent297b85ef11a566ede45d99b38111585e94a90a72 (diff)
Merge "[aapt2] Add placeholder --feature-flags flag" into main
-rw-r--r--tools/aapt2/cmd/Link.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/aapt2/cmd/Link.h b/tools/aapt2/cmd/Link.h
index 1b1e93bd480a..a08f385b2270 100644
--- a/tools/aapt2/cmd/Link.h
+++ b/tools/aapt2/cmd/Link.h
@@ -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