diff options
| author | Ali B <abittin@gmail.com> | 2020-12-07 11:00:44 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@box1> | 2020-12-07 11:00:44 +0100 |
| commit | 0b442578f901a7e5752d0a6fcccaeed49a54e385 (patch) | |
| tree | 78fbc134297e879a57f7728ba264b9ed843a0e43 | |
| parent | de671162c554389cd5ed0cb186d9c1217d29b7d7 (diff) | |
| parent | 22bdb56f80c591c22ac36ebede8af9764349f719 (diff) | |
Merge "build: switch back to lineage sepolicy and add include aicp sepolicy too" into r11.0r11.0
| -rw-r--r-- | core/config.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index 75c0814df5..d89c641ba5 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1234,10 +1234,13 @@ dont_bother_goals := out \ product-graph dump-products ifneq ($(AICP_BUILD),) -ifneq ($(wildcard device/aicp/sepolicy/common/sepolicy.mk),) +ifneq ($(wildcard device/lineage/sepolicy/common/sepolicy.mk),) ## We need to be sure the global selinux policies are included ## last, to avoid accidental resetting by device configs -$(eval include device/aicp/sepolicy/common/sepolicy.mk) +$(eval include device/lineage/sepolicy/common/sepolicy.mk) +endif +ifneq ($(wildcard device/aicp/sepolicy/sepolicy.mk),) +$(eval include device/aicp/sepolicy/sepolicy.mk) endif endif |