aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2020-06-11 11:32:11 -0700
committerColin Cross <ccross@android.com>2020-06-15 09:46:31 -0700
commit95f7b34e8e9c2bc0859932e5075bdeae9e2594d8 (patch)
tree1191cdf2a5db8d5ebfc1e1e9734bfad9cea334e8 /java
parent871b80fb7716fc1b1d7363038a35cd4f430399da (diff)
downloadbuild_soong-95f7b34e8e9c2bc0859932e5075bdeae9e2594d8.tar.gz
build_soong-95f7b34e8e9c2bc0859932e5075bdeae9e2594d8.tar.bz2
build_soong-95f7b34e8e9c2bc0859932e5075bdeae9e2594d8.zip
Use inclusive language in build/soong
Bug: 158889297 Test: m checkbuild Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc Merged-In: Id07890b7cbc2397291a658ca00e86b43c743aafc (cherry picked from commit 440e0d0542043de48f66771f00b67be0de588476)
Diffstat (limited to 'java')
-rwxr-xr-xjava/app.go4
-rw-r--r--java/device_host_converter.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go
index ba056575..46412ac4 100755
--- a/java/app.go
+++ b/java/app.go
@@ -686,9 +686,9 @@ func processMainCert(m android.ModuleBase, certPropValue string, certificates []
systemCertPath := ctx.Config().DefaultAppCertificateDir(ctx).String()
if strings.HasPrefix(certPath, systemCertPath) {
enforceSystemCert := ctx.Config().EnforceSystemCertificate()
- whitelist := ctx.Config().EnforceSystemCertificateWhitelist()
+ allowed := ctx.Config().EnforceSystemCertificateAllowList()
- if enforceSystemCert && !inList(m.Name(), whitelist) {
+ if enforceSystemCert && !inList(m.Name(), allowed) {
ctx.PropertyErrorf("certificate", "The module in product partition cannot be signed with certificate in system.")
}
}
diff --git a/java/device_host_converter.go b/java/device_host_converter.go
index b40ab931..11e68eb6 100644
--- a/java/device_host_converter.go
+++ b/java/device_host_converter.go
@@ -51,7 +51,7 @@ type DeviceForHost struct {
// java_device_for_host makes the classes.jar output of a device java_library module available to host
// java_library modules.
//
-// It is rarely necessary, and its usage is restricted to a few whitelisted projects.
+// It is rarely necessary, and its usage is restricted to a few allowed projects.
func DeviceForHostFactory() android.Module {
module := &DeviceForHost{}
@@ -68,7 +68,7 @@ type HostForDevice struct {
// java_host_for_device makes the classes.jar output of a host java_library module available to device
// java_library modules.
//
-// It is rarely necessary, and its usage is restricted to a few whitelisted projects.
+// It is rarely necessary, and its usage is restricted to a few allowed projects.
func HostForDeviceFactory() android.Module {
module := &HostForDevice{}