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

Merge "Add static_assert to check sizeof off_t" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-09-18 22:39:48 +00:00 • committed by Gerrit Code Review
commit 53a71f6b18
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs_mgr/libsnapshot/snapuserd/Android.bp
View file

@ -74,6 +74,11 @@ cc_library_static {
"user-space-merge/worker.cpp", "user-space-merge/worker.cpp",
"utility.cpp", "utility.cpp",
], ],
cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Wall",
"-Werror",
],
static_libs: [ static_libs: [
"libbase", "libbase",
"libdm", "libdm",
@ -106,6 +111,8 @@ cc_defaults {
cflags: [ cflags: [
"-D_FILE_OFFSET_BITS=64", "-D_FILE_OFFSET_BITS=64",
"-Wall",
"-Werror",
], ],
static_libs: [ static_libs: [
@ -230,6 +237,11 @@ cc_defaults {
"testing/host_harness.cpp", "testing/host_harness.cpp",
"user-space-merge/snapuserd_test.cpp", "user-space-merge/snapuserd_test.cpp",
], ],
cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Wall",
"-Werror",
],
shared_libs: [ shared_libs: [
"libbase", "libbase",
"liblog", "liblog",

1
fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
View file

@ -249,6 +249,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> {
}; };
std::ostream& operator<<(std::ostream& os, MERGE_IO_TRANSITION value); std::ostream& operator<<(std::ostream& os, MERGE_IO_TRANSITION value);
static_assert(sizeof(off_t) == sizeof(uint64_t));
} // namespace snapshot } // namespace snapshot
} // namespace android } // namespace android