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/aapt | |
| 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/aapt')
| -rw-r--r-- | tools/aapt/ConfigDescription.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/ConfigDescription.h b/tools/aapt/ConfigDescription.h index 09430f2532fa..b4ea624524b3 100644 --- a/tools/aapt/ConfigDescription.h +++ b/tools/aapt/ConfigDescription.h @@ -29,7 +29,7 @@ struct ConfigDescription : public android::ResTable_config { size = sizeof(android::ResTable_config); } - ConfigDescription(const android::ResTable_config&o) { // NOLINT(implicit) + ConfigDescription(const android::ResTable_config&o) { // NOLINT(google-explicit-constructor) *static_cast<android::ResTable_config*>(this) = o; size = sizeof(android::ResTable_config); } |