ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cpio: Turn on -Werror"

Browse source
This commit is contained in:
Mark Salyzyn 2014-05-23 17:42:36 +00:00 • committed by Gerrit Code Review
commit 72be6d5eea
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpio/Android.mk
View file

@ -8,6 +8,8 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := mkbootfs
LOCAL_CFLAGS := -Werror
include $(BUILD_HOST_EXECUTABLE)
$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))

5
cpio/mkbootfs.c
View file

@ -78,8 +78,9 @@ static void fix_stat(const char *path, struct stat *s)
s->st_mode = empty_path_config->mode | (s->st_mode & ~07777);
} else {
// Use the compiled-in fs_config() function.
fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &s->st_mode, &capabilities);
unsigned st_mode = s->st_mode;
fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &st_mode, &capabilities);
s->st_mode = (typeof(s->st_mode)) st_mode;
}
}