diff options
| author | 2023-10-26 21:29:30 +0000 | |
|---|---|---|
| committer | 2023-10-26 21:29:30 +0000 | |
| commit | 1bad8c62e21db559ff41c19cf3243e9c53343e9b (patch) | |
| tree | add1581799f497dc6f7f86c9bd759927c9c13497 | |
| parent | fd6f2cbd8162b2a8b4847cbe6476ff5640b582c4 (diff) | |
| parent | 28226eec72c65a3b6084980dadb886e9bb4a3142 (diff) | |
Merge "[aapt2] Add placeholder --feature-flags flag" into main am: 28226eec72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2806055
Change-Id: Ic2fd76220b05b9979a60d59e9309f5f098446c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/aapt2/cmd/Link.h | 2 |
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 |