diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2017-06-08 15:02:31 -0700 |
|---|---|---|
| committer | Jeffrey Vander Stoep <jeffv@google.com> | 2017-06-10 04:16:10 +0000 |
| commit | 6ef44cbece6cb81067c9981ce130a754d85d67a4 (patch) | |
| tree | 53635e8b3cc8dfef979ef6ddf93cfff95299ab0f | |
| parent | 22ffa0d0ae74dfec83b6c1e2097beaac0637ab60 (diff) | |
| download | selinux-oreo-dev.tar.gz | |
Move non-treble devices to split file_contextsandroid-wear-o-preview-4android-vts-8.0_r2android-vts-8.0_r1oreo-dev
Bug: 38502071
Test: build and boot non-Treble Bullhead, run CTS tests below
Test: build and boot Treble Marlin, run CTS tests below
Test: cts-tradefed run singleCommand cts --skip-device-info \
--skip-preconditions --skip-connectivity-check --abi arm64-v8a \
--module CtsSecurityHostTestCases \
-t android.security.cts.SELinuxHostTest#testAospFileContexts
Test: cts-tradefed run singleCommand cts --skip-device-info \
--skip-preconditions --skip-connectivity-check --abi arm64-v8a \
--module CtsSecurityHostTestCases \
-t android.security.cts.SELinuxHostTest#testValidFileContexts
Change-Id: I8d37fa1b4f71af113b9751c65292a2e94d62b3d4
Merged-In: Ia3792e5e8c8d9ef7177d6e309a1e0df54bbf75a5
| -rw-r--r-- | libselinux/src/android/android.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c index 1649ccac..d93b4e82 100644 --- a/libselinux/src/android/android.c +++ b/libselinux/src/android/android.c @@ -61,7 +61,8 @@ static const struct selinux_opt seopts_file_split[] = { }; static const struct selinux_opt seopts_file_rootfs[] = { - { SELABEL_OPT_PATH, "/file_contexts.bin" } + { SELABEL_OPT_PATH, "/plat_file_contexts" }, + { SELABEL_OPT_PATH, "/nonplat_file_contexts" } }; static const char *const sepolicy_file = "/sepolicy"; |