commit a5db154ece158c90c5546b2713bb8b3cb71c0396
author Tom Cherry <tomcherry@google.com> Thu May 24 16:28:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 24 16:28:24 2018 +0000
tree ebe8e68fb92d018bd7d923e06e88bf0fb2bbfceb
parent 35c9537b641ab24b18f67b5eb808cbc7d298cc77
parent 7b8be35ddfc1d53f20b857d39be04b15b9971181

Merge "Finer grained permissions for ctl. properties"

build/soong/filegroup.go

diff --git a/build/soong/filegroup.go b/build/soong/filegroup.go
index 7441834..7f75e48 100644
--- a/build/soong/filegroup.go
+++ b/build/soong/filegroup.go
@@ -122,8 +122,8 @@
 	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())