diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2019-01-04 12:20:01 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-04 12:20:01 -0800 |
| commit | 3b3be3f10f666f0c9fc368d0567466ee9bb8cc68 (patch) | |
| tree | f1a91f4089ea24dea0d4ce26dc3f950867205e93 /tools/aapt2/java | |
| parent | e2ad62f797d794717790ee955c09dd378a4c74bf (diff) | |
| parent | 0bf62f1309fc279039b98a5faaa999ac95f9ee24 (diff) | |
Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings" am: cdf6be573f am: d42fe48c93
am: 0bf62f1309
Change-Id: Iffb7e4a145b172a35dd58b9450d4a5184d8b07f7
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 38b4860d1d61..f9656d112b7b 100644 --- a/tools/aapt2/java/ProguardRules.h +++ b/tools/aapt2/java/ProguardRules.h @@ -49,7 +49,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) { |