pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Windows workaround in file not built for Windows. 

Test: treehugger
Change-Id: I311cfbc9245cbe90ed6fc4fa379ff5b9abdf21e7
This commit is contained in:
Elliott Hughes 2023-09-22 14:37:37 +00:00
parent d741c23288
commit f6a84e4462
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcutils/fs_config.cpp
View File

@ -41,10 +41,6 @@
#include "fs_config.h" #include "fs_config.h"
#ifndef O_BINARY
#define O_BINARY 0
#endif
using android::base::EndsWith; using android::base::EndsWith;
using android::base::StartsWith; using android::base::StartsWith;
@ -257,12 +253,12 @@ static int fs_config_open(int dir, int which, const char* target_out_path) {
len = strip(target_out_path, len, "/"); len = strip(target_out_path, len, "/");
len = strip(target_out_path, len, "/system"); len = strip(target_out_path, len, "/system");
if (asprintf(&name, "%.*s%s", (int)len, target_out_path, conf[which][dir]) != -1) { if (asprintf(&name, "%.*s%s", (int)len, target_out_path, conf[which][dir]) != -1) {
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY)); fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY));
free(name); free(name);
} }
} }
if (fd < 0) { if (fd < 0) {
fd = TEMP_FAILURE_RETRY(open(conf[which][dir], O_RDONLY | O_BINARY)); fd = TEMP_FAILURE_RETRY(open(conf[which][dir], O_RDONLY));
} }
return fd; return fd;
} }