From 1edf16f04cdc9de9f353febfabccf573fa19564f Mon Sep 17 00:00:00 2001 From: OdSazib Date: Tue, 16 Feb 2021 17:44:40 +0600 Subject: [PATCH] sdm660-common: apex: Symlink metadata to existing sessions * Better we do this instead of creating extra dir --- Android.mk | 8 ++++---- rootdir/etc/init.qcom.rc | 4 ---- sepolicy/private/file_contexts | 6 ++++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Android.mk b/Android.mk index ccc9994e..e6858d9e 100644 --- a/Android.mk +++ b/Android.mk @@ -130,13 +130,13 @@ $(EGL_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(EGL_SYMLINKS) -METADATA_SYMLINK := $(TARGET_ROOT_OUT)/metadata -$(METADATA_SYMLINK): $(LOCAL_INSTALLED_MODULE) +METADATA_SYMLINKS := $(TARGET_ROOT_OUT)/metadata +$(METADATA_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Creating $@" @mkdir -p $(TARGET_ROOT_OUT)/metadata - $(hide) ln -sf /data/vendor/metadata_apex $@/apex + $(hide) ln -sf /data/apex $@/apex -ALL_DEFAULT_INSTALLED_MODULES += $(METADATA_SYMLINK) +ALL_DEFAULT_INSTALLED_MODULES += $(METADATA_SYMLINKS) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index fcc79f0f..43a96592 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -231,10 +231,6 @@ on post-fs-data # Create directory used by display clients mkdir /data/vendor/display 0770 system graphics - - # Create apex symlinked dirs - mkdir /data/vendor/metadata_apex 0755 root system - mkdir /data/vendor/metadata_apex/sessions 0700 root system # Change lm related dirs mkdir /data/vendor/lm 0700 root root diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts index f1789ff1..de000cfc 100644 --- a/sepolicy/private/file_contexts +++ b/sepolicy/private/file_contexts @@ -1,6 +1,8 @@ # Apex Metadata -/data/vendor/metadata_apex(/.*)? u:object_r:apex_metadata_file:s0 -/data/vendor/metadata_apex/sessions(/.*)? u:object_r:apex_metadata_file:s0 +/data/apex/sessions(/.*)? u:object_r:apex_metadata_file:s0 +/data/apex/active(/.*)? u:object_r:apex_metadata_file:s0 +/data/apex/backup(/.*)? u:object_r:apex_metadata_file:s0 +/data/apex/hashtree(/.*)? u:object_r:apex_metadata_file:s0 # Executables /system/bin/chargeonlymode u:object_r:charger_exec:s0