Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AndroidSystemSEPolicy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Werner Sembach
AndroidSystemSEPolicy
Commits
bfbdc901
Commit
bfbdc901
authored
8 years ago
by
Sandeep Patil
Committed by
android-build-merger
8 years ago
Browse files
Options
Downloads
Plain Diff
service_context: split into platform and non-platform components. am:
a058b569
am:
88fe61cd
am:
0b0d7168
Change-Id: Ied0b070eff73c11ef355f8d21bc20d7f92219299
parents
e9a3f744
0b0d7168
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Android.mk
+30
-22
30 additions, 22 deletions
Android.mk
private/file_contexts
+2
-1
2 additions, 1 deletion
private/file_contexts
reqd_mask/service_contexts
+3
-0
3 additions, 0 deletions
reqd_mask/service_contexts
with
35 additions
and
23 deletions
Android.mk
+
30
−
22
View file @
bfbdc901
...
...
@@ -814,55 +814,62 @@ general_property_contexts.tmp :=
##################################
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
service_contexts
LOCAL_MODULE
:=
plat_
service_contexts
LOCAL_MODULE_CLASS
:=
ETC
LOCAL_MODULE_TAGS
:=
optional
# TODO: Change module path to TARGET_SYSTEM_OUT after b/27805372
LOCAL_MODULE_PATH
:=
$(
TARGET_ROOT_OUT
)
include
$(BUILD_SYSTEM)/base_rules.mk
all_svc_files
:=
$(
call build_policy, service_contexts,
$(
PLAT_PRIVATE_POLICY
)
$(
BOARD_SEPOLICY_DIRS
))
all_svcfiles_with_nl
:=
$(
call add_nl,
$(
all_svc_files
)
,
$(
built_nl
))
plat_svcfiles
:=
$(
call build_policy, service_contexts,
$(
PLAT_PRIVATE_POLICY
))
service_contexts.tmp
:=
$(
intermediates
)
/service_contexts.tmp
$(service_contexts.tmp)
:
PRIVATE_SVC_FILES := $(
all
_svcfiles
_with_nl
)
$(service_contexts.tmp)
:
PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS)
$(service_contexts.tmp)
:
$(
all
_svcfiles
_with_nl
)
plat_
service_contexts.tmp
:=
$(
intermediates
)
/
plat_
service_contexts.tmp
$(
plat_
service_contexts.tmp)
:
PRIVATE_SVC_FILES := $(
plat
_svcfiles)
$(
plat_
service_contexts.tmp)
:
PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS)
$(
plat_
service_contexts.tmp)
:
$(
plat
_svcfiles)
@
mkdir
-p
$(
dir
$@
)
$(
hide
)
m4
-s
$(
PRIVATE_ADDITIONAL_M4DEFS
)
$(
PRIVATE_SVC_FILES
)
>
$@
$(LOCAL_BUILT_MODULE)
:
PRIVATE_SEPOLICY := $(built_sepolicy)
$(LOCAL_BUILT_MODULE)
:
$(service_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP)
$(LOCAL_BUILT_MODULE)
:
$(
plat_
service_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP)
@
mkdir
-p
$(
dir
$@
)
sed
-e
's/#.*$$//'
-e
'/^$$/d'
$<
>
$@
$(
HOST_OUT_EXECUTABLES
)
/checkfc
-s
$(
PRIVATE_SEPOLICY
)
$@
built_svc
:=
$(
LOCAL_BUILT_MODULE
)
all_svc_files
:=
all_svcfiles_with_nl
:=
service_contexts.tmp
:=
built_plat_svc
:=
$(
LOCAL_BUILT_MODULE
)
plat_svcfiles
:=
plat_service_contexts.tmp
:=
##################################
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
general
_service_contexts
LOCAL_MODULE
:=
nonplat
_service_contexts
LOCAL_MODULE_CLASS
:=
ETC
LOCAL_MODULE_TAGS
:=
tests
LOCAL_MODULE_TAGS
:=
optional
# TODO: Change module path to TARGET_VENDOR_OUT after b/27805372
LOCAL_MODULE_PATH
:=
$(
TARGET_ROOT_OUT
)
include
$(BUILD_SYSTEM)/base_rules.mk
general_service_contexts.tmp
:=
$(
intermediates
)
/general_service_contexts.tmp
$(general_service_contexts.tmp)
:
$(addprefix $(PLAT_PRIVATE_POLICY)/
,
service_contexts)
nonplat_svcfiles
:=
$(
call build_policy, service_contexts,
$(
BOARD_SEPOLICY_DIRS
)
$(
REQD_MASK_POLICY
))
nonplat_service_contexts.tmp
:=
$(
intermediates
)
/nonplat_service_contexts.tmp
$(nonplat_service_contexts.tmp)
:
PRIVATE_SVC_FILES := $(nonplat_svcfiles)
$(nonplat_service_contexts.tmp)
:
PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS)
$(nonplat_service_contexts.tmp)
:
$(nonplat_svcfiles)
@
mkdir
-p
$(
dir
$@
)
$(
hide
)
m4
-s
$
<
>
$@
$(
hide
)
m4
-s
$
(
PRIVATE_ADDITIONAL_M4DEFS
)
$(
PRIVATE_SVC_FILES
)
>
$@
$(LOCAL_BUILT_MODULE)
:
PRIVATE_SEPOLICY := $(built_
general_
sepolicy)
$(LOCAL_BUILT_MODULE)
:
$(
general
_service_contexts.tmp) $(built_
general_
sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP)
$(LOCAL_BUILT_MODULE)
:
PRIVATE_SEPOLICY := $(built_sepolicy)
$(LOCAL_BUILT_MODULE)
:
$(
nonplat
_service_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP)
@
mkdir
-p
$(
dir
$@
)
sed
-e
's/#.*$$//'
-e
'/^$$/d'
$<
>
$@
$(
hide
)
$(
HOST_OUT_EXECUTABLES
)
/checkfc
-s
$(
PRIVATE_SEPOLICY
)
$@
general_service_contexts.tmp
:=
built_nonplat_svc
:=
$(
LOCAL_BUILT_MODULE
)
nonplat_svcfiles
:=
nonplat_service_contexts.tmp
:=
##################################
include
$(CLEAR_VARS)
...
...
@@ -936,7 +943,7 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include
$(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE)
:
$(built_sepolicy) $(built_pc) $(built_plat_fc)
\
$(buit_nonplat_fc) $(built_plat_sc) $(built_nonplat_sc) $(built_svc)
$(buit_nonplat_fc) $(built_plat_sc) $(built_nonplat_sc) $(built_
plat_svc) $(built_nonplat_
svc)
@
mkdir
-p
$(
dir
$@
)
$(
hide
)
echo
-n
$(
BUILD_FINGERPRINT_FROM_FILE
)
>
$@
...
...
@@ -954,7 +961,8 @@ built_pc :=
built_nonplat_sc
:=
built_plat_sc
:=
built_sepolicy
:=
built_svc
:=
built_plat_svc
:=
built_nonplat_svc
:=
mapping_policy_nvr
:=
mapping_policy_nvr.recovery
:=
my_target_arch
:=
...
...
This diff is collapsed.
Click to expand it.
private/file_contexts
+
2
−
1
View file @
bfbdc901
...
...
@@ -46,7 +46,8 @@
/nonplat_seapp_contexts u:object_r:rootfs:s0
/plat_seapp_contexts u:object_r:rootfs:s0
/sepolicy u:object_r:rootfs:s0
/service_contexts u:object_r:rootfs:s0
/plat_service_contexts u:object_r:rootfs:s0
/nonplat_service_contexts u:object_r:rootfs:s0
##########################
# Devices
...
...
This diff is collapsed.
Click to expand it.
reqd_mask/service_contexts
0 → 100644
+
3
−
0
View file @
bfbdc901
# empty service_contexts file - this file is used to generate an empty
# non-platform service_context for devices without any service_contexts
# customizations.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment