Merge "Use -Werror in build/make" am: 2d1681c804

am: 7dba41687e

Change-Id: I8a4362aeb201542491f218b3b0a167998fe14abd

tools/acp/Android.bp

@@ -5,6 +5,7 @@
 cc_binary_host {
 
     srcs: ["acp.c"],
+    cflags: ["-Wall", "-Werror"],
 
     static_libs: ["libhost"],
     name: "acp",

tools/acp/acp.c

@@ -41,10 +41,9 @@
 int process(int argc, char* const argv[], unsigned int options)
 {
     int retVal = 0;
-    int i, cc;
+    int i;
     char* stripDest = NULL;
     int stripDestLen;
-    struct stat destStat;
     bool destMustBeDir = false;
     struct stat sb;
 

tools/atree/Android.bp

@@ -9,5 +9,6 @@ cc_binary_host {
         "files.cpp",
         "fs.cpp",
     ],
+    cflags: ["-Wall", "-Werror"],
     static_libs: ["libhost"],
 }

tools/atree/files.cpp

@@ -425,8 +425,6 @@ list_dir(const string& path, const FileRecord& rec,
                 const vector<string>& excludes,
                 vector<FileRecord>* more)
 {
-    int err;
-
     string full = path_append(rec.sourceBase, rec.sourceName);
     full = path_append(full, path);
 

tools/fs_get_stats/Android.bp

@@ -1,6 +1,7 @@
 cc_binary_host {
     name: "fs_get_stats",
     srcs: ["fs_get_stats.c"],
+    cflags: ["-Wall", "-Werror"],
     shared_libs: [
         "libcutils",
         "liblog",

tools/zipalign/Android.bp

@@ -13,6 +13,8 @@ cc_binary_host {
         "ZipFile.cpp",
     ],
 
+    cflags: ["-Wall", "-Werror"],
+
     static_libs: [
         "libandroidfw",
         "libutils",

tools/zipalign/ZipFile.cpp

@@ -785,8 +785,6 @@ status_t ZipFile::copyFpToFp(FILE* dstFp, FILE* srcFp, uint32_t* pCRC32)
 status_t ZipFile::copyDataToFp(FILE* dstFp,
     const void* data, size_t size, uint32_t* pCRC32)
 {
-    size_t count;
-
     *pCRC32 = crc32(0L, Z_NULL, 0);
     if (size > 0) {
         *pCRC32 = crc32(*pCRC32, (const unsigned char*)data, size);

tools/ziptime/Android.bp

@@ -27,6 +27,7 @@ cc_binary_host {
     ],
 
     name: "ziptime",
+    cflags: ["-Wall", "-Werror"],
     target: {
         windows: {
             enabled: true,

tools/ziptime/ZipEntry.cpp

@@ -86,7 +86,6 @@ status_t ZipEntry::initAndRewriteFromCDE(FILE* fp)
  */
 status_t ZipEntry::LocalFileHeader::rewrite(FILE* fp)
 {
-    status_t result = 0;
     uint8_t buf[kLFHLen];
 
     if (fread(buf, 1, kLFHLen, fp) != kLFHLen)
@@ -124,7 +123,6 @@ status_t ZipEntry::LocalFileHeader::rewrite(FILE* fp)
  */
 status_t ZipEntry::CentralDirEntry::rewrite(FILE* fp)
 {
-    status_t result = 0;
     uint8_t buf[kCDELen];
     uint16_t fileNameLength, extraFieldLength, fileCommentLength;