diff options
| author | 2019-01-04 11:55:42 -0800 | |
|---|---|---|
| committer | 2019-01-04 11:55:42 -0800 | |
| commit | d42fe48c93e0916d923d4877db3ccb222e1898e6 (patch) | |
| tree | 80aec305f03536f9cefb4641ee388e89f06769c2 /tools/aapt2/java | |
| parent | cb53e78f5634b5e46d18f23798a84457f1b5dcf1 (diff) | |
| parent | cdf6be573f61f07e59e6cf8e88519f7cd9da47ab (diff) | |
Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings"
am: cdf6be573f
Change-Id: I4fbcbdd7e845f2ce7106a85ce8224c17517db1f5
Diffstat (limited to 'tools/aapt2/java')
| -rw-r--r-- | tools/aapt2/java/ProguardRules.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h index 46827ee7cf93..c53f3076d85e 100644 --- a/tools/aapt2/java/ProguardRules.h +++ b/tools/aapt2/java/ProguardRules.h @@ -44,7 +44,7 @@ class KeepSet { public: KeepSet() = default; - KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { + explicit KeepSet(bool conditional_keep_rules) : conditional_keep_rules_(conditional_keep_rules) { } inline void AddManifestClass(const UsageLocation& file, const std::string& class_name) { |