| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | Subject: drop useless includes of Android SELINUX extensions; avoids having to clone another module; this should be sent upstream |
| 2 | Author: Sergio Schvezov <sergio.schvezov@canonical.com> |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | --- |
| 6 | system/core/adb/file_sync_service.c | 3 --- |
| 7 | system/extras/ext4_utils/make_ext4fs.c | 1 - |
| 8 | system/extras/ext4_utils/make_ext4fs_main.c | 1 - |
| 9 | 3 files changed, 5 deletions(-) |
| 10 | |
| 11 | --- a/system/extras/ext4_utils/make_ext4fs.c |
| 12 | +++ b/system/extras/ext4_utils/make_ext4fs.c |
| 13 | @@ -62,7 +62,6 @@ |
| 14 | |
| 15 | #include <selinux/selinux.h> |
| 16 | #include <selinux/label.h> |
| 17 | -#include <selinux/android.h> |
| 18 | |
| 19 | #define O_BINARY 0 |
| 20 | |
| 21 | --- a/system/extras/ext4_utils/make_ext4fs_main.c |
| 22 | +++ b/system/extras/ext4_utils/make_ext4fs_main.c |
| 23 | @@ -32,7 +32,6 @@ |
| 24 | #ifndef USE_MINGW |
| 25 | #include <selinux/selinux.h> |
| 26 | #include <selinux/label.h> |
| 27 | -#include <selinux/android.h> |
| 28 | #else |
| 29 | struct selabel_handle; |
| 30 | #endif |
| 31 | --- a/system/core/adb/file_sync_service.c |
| 32 | +++ b/system/core/adb/file_sync_service.c |
| 33 | @@ -26,7 +26,6 @@ |
| 34 | |
| 35 | #include <errno.h> |
| 36 | #include <private/android_filesystem_config.h> |
| 37 | -#include <selinux/android.h> |
| 38 | #include "sysdeps.h" |
| 39 | |
| 40 | #define TRACE_TAG TRACE_SYNC |
| 41 | @@ -73,7 +72,6 @@ static int mkdirs(char *name) |
| 42 | *x = '/'; |
| 43 | return ret; |
| 44 | } |
| 45 | - selinux_android_restorecon(name, 0); |
| 46 | } |
| 47 | *x++ = '/'; |
| 48 | } |
| 49 | @@ -251,7 +249,6 @@ static int handle_send_file(int s, char |
| 50 | if(fd >= 0) { |
| 51 | struct utimbuf u; |
| 52 | adb_close(fd); |
| 53 | - selinux_android_restorecon(path, 0); |
| 54 | u.actime = timestamp; |
| 55 | u.modtime = timestamp; |
| 56 | utime(path, &u); |