summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Tobias Thierer <tobiast@google.com> 2019-05-29 04:26:33 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-29 04:26:33 -0700
commit76b62e159689f5a2e060a9c270f0ce8fe7255566 (patch)
tree8cbe7b37c68576f1b6254151bb871ab4217d953a /java
parent9b61c51463795d19c1d00dc8aa297982384e73ce (diff)
parent9d4e40ea2db1262ebc97b53275811befd88307d4 (diff)
Merge "Support defaults properties in java_system_module" am: 4b06c20215
am: 9d4e40ea2d Change-Id: Ib0c4bcfcaf527ff48f21a929deb9fc4666208a92
Diffstat (limited to 'java')
-rw-r--r--java/system_modules.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/system_modules.go b/java/system_modules.go
index 9ee0307ca..8005360a2 100644
--- a/java/system_modules.go
+++ b/java/system_modules.go
@@ -87,11 +87,13 @@ func SystemModulesFactory() android.Module {
module := &SystemModules{}
module.AddProperties(&module.properties)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
+ android.InitDefaultableModule(module)
return module
}
type SystemModules struct {
android.ModuleBase
+ android.DefaultableModuleBase
properties SystemModulesProperties