tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add build flags for libselinux" into main am: c23cbe8ca5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2971894

Change-Id: Iab88e01241410a5803177f30093e5b444692af6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thiébaud Weksteen 2024-03-05 00:00:47 +00:00 committed by Automerger Merge Worker
commit c20d8480e5
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libselinux/Android.bp
View file

@ -52,6 +52,7 @@ common_CFLAGS = [
cc_defaults {
name: "libselinux_defaults",
defaults: ["libselinux_flags_defaults"],
cflags: common_CFLAGS,
@ -157,6 +158,28 @@ cc_defaults {
stl: "none",
}
soong_config_module_type {
name: "cc_defaults_libselinux_flags",
module_type: "cc_defaults",
config_namespace: "ANDROID",
bool_variables: [
"release_selinux_data_data_ignore",
],
properties: [
"cflags",
],
}
cc_defaults_libselinux_flags {
name: "libselinux_flags_defaults",
host_supported: true,
soong_config_variables: {
release_selinux_data_data_ignore: {
cflags: ["-DSELINUX_FLAGS_DATA_DATA_IGNORE"],
}
}
}
cc_library {
name: "libselinux",
defaults: ["libselinux_defaults"],

5
libselinux/src/android/android_device.c
View file

@ -281,6 +281,11 @@ struct pkg_info *package_info_lookup(const char *name)
*/
static bool is_app_data_path(const char *pathname) {
int flags = FNM_LEADING_DIR|FNM_PATHNAME;
#ifdef SELINUX_FLAGS_DATA_DATA_IGNORE
if (!strcmp(pathname, DATA_DATA_PATH)) {
return true;
}
#endif
return (!strncmp(pathname, DATA_DATA_PREFIX, sizeof(DATA_DATA_PREFIX)-1) ||
!strncmp(pathname, DATA_USER_PREFIX, sizeof(DATA_USER_PREFIX)-1) ||
!strncmp(pathname, DATA_USER_DE_PREFIX, sizeof(DATA_USER_DE_PREFIX)-1) ||