diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2018-04-17 14:58:42 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2018-04-18 18:56:33 +0000 |
| commit | 955dc4999e5a7f08a8fa9cd52e528a2156d85d5f (patch) | |
| tree | bf075106847ccd1f898d4f7354e21b2abceb19a9 /java/java_test.go | |
| parent | 6284323772a3ac5f7e56ba3601a1e0348bb6c454 (diff) | |
Fix few issues with filegroups
Bug: http://b/64121881
Bug: http://b/78188880
- Allow filegroup's properties to be extended by a LoadHook
- Support a filegroup (':module') in a prebuilt's 'Srcs' property to
export files from a different path as the prebuilt's sources.
This change also includes a refactoring that moves genrule/filegroup.go
to android/filegroup.go so that FileGroupFactory is visible in
prebuilt_test.go.
Test: Test
https://android-review.googlesource.com/c/platform/development/+/469159
in clang-tools branch on Linux, Darwin. Test regular build in
aosp/master.
Change-Id: I3ff6215ab2e62955f039fd1086c31f1bd50ebcf6
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 65db68d5e..d4f2be19e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -78,7 +78,7 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) ctx.RegisterModuleType("java_system_modules", android.ModuleFactoryAdaptor(SystemModulesFactory)) ctx.RegisterModuleType("java_genrule", android.ModuleFactoryAdaptor(genRuleFactory)) - ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(genrule.FileGroupFactory)) + ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(android.FileGroupFactory)) ctx.RegisterModuleType("genrule", android.ModuleFactoryAdaptor(genrule.GenRuleFactory)) ctx.RegisterModuleType("droiddoc", android.ModuleFactoryAdaptor(DroiddocFactory)) ctx.RegisterModuleType("droiddoc_host", android.ModuleFactoryAdaptor(DroiddocHostFactory)) |