diff options
| author | Steven Moreland <smoreland@google.com> | 2017-12-15 17:51:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-15 17:51:27 +0000 |
| commit | d71325b281a808460d25dbb31a1bae390c376941 (patch) | |
| tree | b1e81b7fd3fa9ba10b12fd7047589f498faa3750 | |
| parent | fdeec0a7180d4d8e71c1eccfe073c51f25abb6ec (diff) | |
| parent | 9ee3927b40f6a38e0f772dcec6239fa4cd20fede (diff) | |
| download | selinux-d71325b281a808460d25dbb31a1bae390c376941.tar.gz | |
Use sepolicy_split instead of treble. am: ffe1116192
am: 9ee3927b40
Change-Id: Ie0a392bc34984e917bc485a86756b9c3ae1e0211
| -rw-r--r-- | libselinux/Android.bp | 4 | ||||
| -rw-r--r-- | libselinux/src/android/android.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libselinux/Android.bp b/libselinux/Android.bp index b13f5773..fffb05b9 100644 --- a/libselinux/Android.bp +++ b/libselinux/Android.bp @@ -93,8 +93,8 @@ cc_defaults { }, product_variables: { - treble: { - cflags: ["-DFULL_TREBLE"], + sepolicy_split: { + cflags: ["-DSEPOLICY_SPLIT"], }, }, diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c index 4f5df2a0..06850dc9 100644 --- a/libselinux/src/android/android.c +++ b/libselinux/src/android/android.c @@ -14,7 +14,7 @@ static const struct selinux_opt seopts_service_plat[] = { { SELABEL_OPT_PATH, "/plat_service_contexts" } }; -#ifndef FULL_TREBLE +#ifndef SEPOLICY_SPLIT static const struct selinux_opt seopts_service_vendor[] = { { SELABEL_OPT_PATH, "/vendor/etc/selinux/vendor_service_contexts" }, { SELABEL_OPT_PATH, "/vendor_service_contexts" }, @@ -77,7 +77,7 @@ struct selabel_handle* selinux_android_service_context_handle(void) break; } } -#ifndef FULL_TREBLE +#ifndef SEPOLICY_SPLIT for (i = 0; i < ARRAY_SIZE(seopts_service_vendor); i++) { if (access(seopts_service_vendor[i].value, R_OK) != -1) { seopts_service[size++] = seopts_service_vendor[i]; |