From 111cdce6ac4dab7e01bcbf84cbaa709f62a8b383 Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Sun, 20 May 2018 14:37:04 -0700
Subject: [PATCH] Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR
dirs
After https://android-review.googlesource.com/688488
BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR can now specify multiple
directories.
Bug: n/a
Test: build sepolicy
Change-Id: Ie2af81a4f9462cd05352db71fd1e515531d42334
---
build/soong/filegroup.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/soong/filegroup.go b/build/soong/filegroup.go
index 744183443..7f75e4852 100644
--- a/build/soong/filegroup.go
+++ b/build/soong/filegroup.go
@@ -122,8 +122,8 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx android.ModuleContext) {
fg.systemVendorSrcs = fg.findSrcsInDir(ctx, filepath.Join(ctx.ModuleDir(), "vendor"))
fg.systemReqdMaskSrcs = fg.findSrcsInDir(ctx, filepath.Join(ctx.ModuleDir(), "reqd_mask"))
- fg.systemExtPublicSrcs = fg.findSrcsInDir(ctx, ctx.DeviceConfig().PlatPublicSepolicyDir())
- fg.systemExtPrivateSrcs = fg.findSrcsInDir(ctx, ctx.DeviceConfig().PlatPrivateSepolicyDir())
+ fg.systemExtPublicSrcs = fg.findSrcsInDirs(ctx, ctx.DeviceConfig().PlatPublicSepolicyDirs())
+ fg.systemExtPrivateSrcs = fg.findSrcsInDirs(ctx, ctx.DeviceConfig().PlatPrivateSepolicyDirs())
fg.vendorSrcs = fg.findSrcsInDirs(ctx, ctx.DeviceConfig().VendorSepolicyDirs())
fg.odmSrcs = fg.findSrcsInDirs(ctx, ctx.DeviceConfig().OdmSepolicyDirs())
--
GitLab