Merge "Fix google-explicit-constructor warnings."
diff --git a/core/clang/tidy.mk b/core/clang/tidy.mk
index e8a69ef..e61b878 100644
--- a/core/clang/tidy.mk
+++ b/core/clang/tidy.mk
@@ -29,10 +29,15 @@
# where google-runtime-int is enabled at the end.
DEFAULT_LOCAL_TIDY_CHECKS := \
external/:,-google-build-using-namespace \
- external/:,-google-explicit-constructor \
- external/:,-google-runtime-int \
+ external/:,-google-explicit-constructor,-google-runtime-int \
external/google:,google-runtime-int \
external/webrtc/:,google-runtime-int \
+ hardware/qcom:,-google-build-using-namespace \
+ hardware/qcom:,-google-explicit-constructor,-google-runtime-int \
+ vendor/lge:,-google-build-using-namespace \
+ vendor/lge:,-google-explicit-constructor,-google-runtime-int \
+ vendor/widevine:,-google-build-using-namespace \
+ vendor/widevine:,-google-explicit-constructor,-google-runtime-int \
# Returns 2nd word of $(1) if $(2) has prefix of the 1st word of $(1).
define find_default_local_tidy_check2
diff --git a/tools/zipalign/ZipAlign.cpp b/tools/zipalign/ZipAlign.cpp
index a2dfd02..aef91a5 100644
--- a/tools/zipalign/ZipAlign.cpp
+++ b/tools/zipalign/ZipAlign.cpp
@@ -33,12 +33,12 @@
fprintf(stderr, "Copyright (C) 2009 The Android Open Source Project\n\n");
fprintf(stderr,
"Usage: zipalign [-f] [-p] [-v] [-z] <align> infile.zip outfile.zip\n"
- " zipalign -c [-v] <align> infile.zip\n\n" );
+ " zipalign -c [-p] [-v] <align> infile.zip\n\n" );
fprintf(stderr,
" <align>: alignment in bytes, e.g. '4' provides 32-bit alignment\n");
fprintf(stderr, " -c: check alignment only (does not modify file)\n");
fprintf(stderr, " -f: overwrite existing outfile.zip\n");
- fprintf(stderr, " -p: page align stored shared object files\n");
+ fprintf(stderr, " -p: memory page alignment for stored shared object files\n");
fprintf(stderr, " -v: verbose output\n");
fprintf(stderr, " -z: recompress using Zopfli\n");
}