diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-05 00:17:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-05 00:17:29 +0000 |
| commit | c273640edd4b982e0076dd0959188eb6f68a9021 (patch) | |
| tree | bdd6e2baad66dedb64056a5d17531c92c2ae875c /init/builtins.cpp | |
| parent | 834f4021afb5a76155f45c3c12c07e9427df8826 (diff) | |
| parent | 59b61beab4fc9bf10bb5f866b64956c6a46b14fb (diff) | |
Snap for 6111104 from 59b61beab4fc9bf10bb5f866b64956c6a46b14fb to rvc-release
Change-Id: I8e529e5d1871a9e5f619fb69935dacc8dd0ebb13
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 64d9c5907..2a6df84f1 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -60,6 +60,7 @@ #include <fscrypt/fscrypt.h> #include <libgsi/libgsi.h> #include <logwrap/logwrap.h> +#include <private/android_filesystem_config.h> #include <selinux/android.h> #include <selinux/label.h> #include <selinux/selinux.h> @@ -1266,9 +1267,7 @@ static Result<void> create_apex_data_dirs() { if (strchr(name, '@') != nullptr) continue; auto path = "/data/misc/apexdata/" + std::string(name); - auto system_uid = DecodeUid("system"); - auto options = - MkdirOptions{path, 0700, *system_uid, *system_uid, FscryptAction::kNone, "ref"}; + auto options = MkdirOptions{path, 0770, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"}; make_dir_with_options(options); } return {}; |