diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:11:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:11:30 +0000 |
| commit | 8c2ad73742ead5dd9cec3ac78be9ca002ca8ee38 (patch) | |
| tree | f00beba53a100089712066911c84264d87045a02 /init/builtins.cpp | |
| parent | ad2971e844ce6836df4745bc558afa159edc2843 (diff) | |
| parent | 033712a74e9c62cf77b5c9112b272be2643c23e0 (diff) | |
Snap for 5605895 from 033712a74e9c62cf77b5c9112b272be2643c23e0 to rvc-release
Change-Id: Ic2c954bebe8a095eb71d35839dd992aef04ee805
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 6ce773672..840f2d422 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -16,6 +16,7 @@ #include "builtins.h" +#include <android/api-level.h> #include <dirent.h> #include <errno.h> #include <fcntl.h> @@ -62,6 +63,7 @@ #include "action_manager.h" #include "bootchart.h" +#include "host_init_stubs.h" #include "init.h" #include "mount_namespace.h" #include "parser.h" @@ -588,7 +590,7 @@ static Result<Success> do_mount_all(const BuiltinArguments& args) { auto mount_fstab_return_code = fs_mgr_mount_all(&fstab, mount_mode); property_set(prop_name, std::to_string(t.duration().count())); - if (import_rc) { + if (import_rc && SelinuxGetVendorAndroidVersion() <= __ANDROID_API_Q__) { /* Paths of .rc files are specified at the 2nd argument and beyond */ import_late(args.args, 2, path_arg_end); } |