diff options
| author | Steven Moreland <smoreland@google.com> | 2017-12-13 14:13:10 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-12-13 14:13:37 -0800 |
| commit | ffe11161926d635a0d076b0b7a123ce389110c81 (patch) | |
| tree | b1e81b7fd3fa9ba10b12fd7047589f498faa3750 | |
| parent | 220e17d0a2a2ee817298cda9f123534d6b5e0c74 (diff) | |
| download | selinux-ffe11161926d635a0d076b0b7a123ce389110c81.tar.gz | |
Use sepolicy_split instead of treble.
It's more specific.
Bug: 62019611
Test: manual
Change-Id: I27a25f39ee7b2e0f5a6e759f2d4da0b6bbeba2c2
| -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]; |