diff options
| author | 2019-01-04 12:09:56 -0800 | |
|---|---|---|
| committer | 2019-01-04 12:09:56 -0800 | |
| commit | 0bf62f1309fc279039b98a5faaa999ac95f9ee24 (patch) | |
| tree | 394da0e89289d6aa2de3924f99775cb8724510a8 /tools/aapt2/java | |
| parent | 3c6bc9b14d8dff7d8fa6f4c0a99266d92981f07f (diff) | |
| parent | d42fe48c93e0916d923d4877db3ccb222e1898e6 (diff) | |
Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings" am: cdf6be573f
am: d42fe48c93
Change-Id: Ie418def364cdff53ba02a07d9979f10dcd819698
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) { |