diff options
author | Inseob Kim <inseob@google.com> | 2019-04-15 20:21:29 +0900 |
---|---|---|
committer | Inseob Kim <inseob@google.com> | 2019-04-23 10:10:56 +0900 |
commit | 0866b003b2a21e88df518e6948204a58d8f79529 (patch) | |
tree | 1dbaf25cdaa0d56383f6ffd3f85307837b331357 /android | |
parent | 6fa6dfa25d67c83ea86d5cb76857d19553ca1a3e (diff) | |
download | soong-0866b003b2a21e88df518e6948204a58d8f79529.tar.gz |
Build contexts files with Soong
This is to migrate sepolicy Makefiles into Soong. For the first part,
file_contexts, hwservice_contexts, property_contexts, and
service_contexts are migrated. Build-time tests for contexts files are
still in Makefile; they will also be done with Soong after porting the
module sepolicy.
The motivation of migrating is based on generating property_contexts
dynamically: if we were to amend contexts files at build time in the
future, it would be nicer to manage them in Soong. To do that, building
contexts files with Soong can be very helpful.
Bug: 127949646
Bug: 129377144
Test: 1) Build blueline-userdebug, flash, and boot.
Test: 2) Build blueline-userdebug with TARGET_FLATTEN_APEX=true, flash,
and boot.
Test: 3) Build aosp_arm-userdebug.
Change-Id: I49206e656564206d6f7265206361666665696e65
Diffstat (limited to 'android')
-rw-r--r-- | android/config.go | 16 | ||||
-rw-r--r-- | android/variable.go | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index ca376dbf6..18ce6c370 100644 --- a/android/config.go +++ b/android/config.go @@ -924,6 +924,10 @@ func (c *deviceConfig) PlatPrivateSepolicyDirs() []string { return c.config.productVariables.BoardPlatPrivateSepolicyDirs } +func (c *deviceConfig) SepolicyM4Defs() []string { + return c.config.productVariables.BoardSepolicyM4Defs +} + func (c *deviceConfig) OverrideManifestPackageNameFor(name string) (manifestName string, overridden bool) { return findOverrideValue(c.config.productVariables.ManifestPackageNameOverrides, name, "invalid override rule %q in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES should be <module_name>:<manifest_name>") @@ -1056,3 +1060,15 @@ func (c *config) ProductHiddenAPIStubsTest() []string { func (c *deviceConfig) TargetFSConfigGen() []string { return c.config.productVariables.TargetFSConfigGen } + +func (c *config) ProductPublicSepolicyDirs() []string { + return c.productVariables.ProductPublicSepolicyDirs +} + +func (c *config) ProductPrivateSepolicyDirs() []string { + return c.productVariables.ProductPrivateSepolicyDirs +} + +func (c *config) ProductCompatibleProperty() bool { + return Bool(c.productVariables.ProductCompatibleProperty) +} diff --git a/android/variable.go b/android/variable.go index f3da66de4..d29ba73be 100644 --- a/android/variable.go +++ b/android/variable.go @@ -267,6 +267,7 @@ type productVariables struct { BoardOdmSepolicyDirs []string `json:",omitempty"` BoardPlatPublicSepolicyDirs []string `json:",omitempty"` BoardPlatPrivateSepolicyDirs []string `json:",omitempty"` + BoardSepolicyM4Defs []string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"` @@ -288,6 +289,10 @@ type productVariables struct { ProductHiddenAPIStubsSystem []string `json:",omitempty"` ProductHiddenAPIStubsTest []string `json:",omitempty"` + ProductPublicSepolicyDirs []string `json:",omitempty"` + ProductPrivateSepolicyDirs []string `json:",omitempty"` + ProductCompatibleProperty *bool `json:",omitempty"` + TargetFSConfigGen []string `json:",omitempty"` } |