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

am: 87b8c55312

Change-Id: I12ebc5273e1e95bf5907390d5e6ca8894ac82c6f
This commit is contained in:
Chih-Hung Hsieh 2017-10-03 23:00:15 +00:00 committed by android-build-merger
commit cc60af86c4
9 changed files with 7 additions and 8 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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