diff options
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | android_filesystem_config.h | 44 | ||||
| -rw-r--r-- | config.fs | 29 | ||||
| -rw-r--r-- | device.mk | 2 |
4 files changed, 33 insertions, 45 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index dd0c8ca..79bc5c9 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -158,6 +158,9 @@ TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true VSYNC_EVENT_PHASE_OFFSET_NS := 2000000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000 +# Filesystem +TARGET_FS_CONFIG_GEN := $(PLATFORM_PATH)/config.fs + # Init TARGET_INIT_VENDOR_LIB := libinit_z2_plus TARGET_RECOVERY_DEVICE_MODULES := libinit_z2_plus diff --git a/android_filesystem_config.h b/android_filesystem_config.h deleted file mode 100644 index 8bb29d8..0000000 --- a/android_filesystem_config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -# Copyright (c) 2016, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include <private/android_filesystem_config.h> - - -#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS -static const struct fs_path_config android_device_files[] = { - // { 00755, AID_UID, AID_GID, (1ULL << CAPABILITY), "PATH_TO_BINARY" }, - { 00755, AID_BLUETOOTH, AID_BLUETOOTH, (1ULL << CAP_BLOCK_SUSPEND), "system/bin/wcnss_filter" }, - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"}, - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service"}, - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" }, - { 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" }, -#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS - { 00000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_dirs" }, -#endif -}; diff --git a/config.fs b/config.fs new file mode 100644 index 0000000..ea08834 --- /dev/null +++ b/config.fs @@ -0,0 +1,29 @@ +[system/bin/wcnss_filter] +mode: 0755 +user: AID_BLUETOOTH +group: AID_BLUETOOTH +caps: BLOCK_SUSPEND + +[system/bin/cnss-daemon] +mode: 0755 +user: AID_SYSTEM +group: AID_SYSTEM +caps: NET_BIND_SERVICE + +[system/bin/pm-service] +mode: 0755 +user: AID_SYSTEM +group: AID_SYSTEM +caps: NET_BIND_SERVICE + +[system/bin/imsdatadaemon] +mode: 0755 +user: AID_SYSTEM +group: AID_SYSTEM +caps: NET_BIND_SERVICE + +[system/bin/ims_rtp_daemon] +mode: 0755 +user: AID_SYSTEM +group: AID_RADIO +caps: NET_BIND_SERVICE @@ -134,7 +134,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.1-service -# For android_filesystem_config.h +# For config.fs PRODUCT_PACKAGES += \ fs_config_files |