diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-14 12:52:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 12:52:42 +0000 |
commit | a15fcce79d1f5e7966c881f1469d6d358c344115 (patch) | |
tree | dbf7817b634cf9b7c3f3b1286e9afc48954b83d6 | |
parent | b975bafc296b868ab464db0ff9873dc1808ecdd1 (diff) | |
parent | 07252c07d7b9c584509b8623a759568b83f88db2 (diff) | |
download | selinux-android12-qpr1-release.tar.gz |
Merge "selinux: remove last slash in CE dirs macro" am: 130aa3e3a5 am: 37501c1cb9 am: 07252c07d7android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/1695287
Change-Id: If4739dce4d5b4f537958b60ab2e05608df4be881
-rw-r--r-- | libselinux/src/android/android_platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c index 2ffe4155..2e52c153 100644 --- a/libselinux/src/android/android_platform.c +++ b/libselinux/src/android/android_platform.c @@ -1179,9 +1179,9 @@ struct pkg_info *package_info_lookup(const char *name) * credentials are presented (filenames inside are mangled), so we need * to delay restorecon of those until vold explicitly requests it. */ // NOTE: these paths need to be kept in sync with vold -#define DATA_SYSTEM_CE_PREFIX "/data/system_ce/" -#define DATA_VENDOR_CE_PREFIX "/data/vendor_ce/" -#define DATA_MISC_CE_PREFIX "/data/misc_ce/" +#define DATA_SYSTEM_CE_PREFIX "/data/system_ce" +#define DATA_VENDOR_CE_PREFIX "/data/vendor_ce" +#define DATA_MISC_CE_PREFIX "/data/misc_ce" /* The path prefixes of package data directories. */ #define DATA_DATA_PATH "/data/data" |