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

Remove libselinux_vendor

Browse source 
libselinux_vendor is removed and merged to libselinux by using
vendor_available:true.

Bug: 66914194
Test: lunch aosp_arm64_ab-userdebug; m libselinux.vendor

Change-Id: Idc04eccf8a9803b9acf6277a9d078a1528ed29c9
This commit is contained in:
Jiyong Park 2017-10-13 09:17:27 +09:00
parent 970199321d
commit 57071adff4
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libselinux/Android.bp
View file

@ -102,26 +102,10 @@ cc_defaults {
export_include_dirs: ["include"], export_include_dirs: ["include"],
} }
cc_library_shared {
name: "libselinux_vendor",
defaults: ["libselinux_defaults"],
vendor: true,
cflags: ["-DNO_FILE_BACKEND"],
target: {
android: {
version_script: "exported_vendor.map",
},
},
srcs: [
"src/android/android_vendor.c",
],
}
cc_library { cc_library {
name: "libselinux", name: "libselinux",
defaults: ["libselinux_defaults"], defaults: ["libselinux_defaults"],
vendor_available: true,
host_supported: true, host_supported: true,
cflags: ["-DUSE_PCRE2"], cflags: ["-DUSE_PCRE2"],
@ -192,6 +176,19 @@ cc_library {
version_script: "exported.map", version_script: "exported.map",
}, },
vendor: {
exclude_srcs: [
"src/android/android_platform.c",
],
srcs: [
"src/android/android_vendor.c",
],
cflags: ["-DNO_FILE_BACKEND"],
exclude_shared_libs: ["libpackagelistparser"],
exclude_static_libs: ["libpackagelistparser"],
version_script: "exported_vendor.map",
},
}, },
static: { static: {

4
libselinux/src/android/android_vendor.c
View file

@ -3,12 +3,12 @@
int selinux_android_restorecon(const char *file __attribute__((unused)), int selinux_android_restorecon(const char *file __attribute__((unused)),
unsigned int flags __attribute__((unused))) unsigned int flags __attribute__((unused)))
{ {
selinux_log(SELINUX_ERROR, "%s: not implemented for libselinux_vendor\n", __FUNCTION__); selinux_log(SELINUX_ERROR, "%s: not implemented for vendor variant of libselinux\n", __FUNCTION__);
return -1; return -1;
} }
struct selabel_handle* selinux_android_prop_context_handle(void) struct selabel_handle* selinux_android_prop_context_handle(void)
{ {
selinux_log(SELINUX_ERROR, "%s: not implemented for libselinux_vendor\n", __FUNCTION__); selinux_log(SELINUX_ERROR, "%s: not implemented for vendor variant of libselinux\n", __FUNCTION__);
return NULL; return NULL;
} }