diff options
author | 2018-04-17 14:58:42 -0700 | |
---|---|---|
committer | 2018-04-18 18:56:33 +0000 | |
commit | 955dc4999e5a7f08a8fa9cd52e528a2156d85d5f (patch) | |
tree | bf075106847ccd1f898d4f7354e21b2abceb19a9 /android/prebuilt_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 'android/prebuilt_test.go')
-rw-r--r-- | android/prebuilt_test.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/android/prebuilt_test.go b/android/prebuilt_test.go index 69ce16a3c..cd1ffae12 100644 --- a/android/prebuilt_test.go +++ b/android/prebuilt_test.go @@ -109,6 +109,19 @@ var prebuiltsTests = []struct { }`, prebuilt: false, }, + { + name: "prebuilt file from filegroup preferred", + modules: ` + filegroup { + name: "fg", + } + prebuilt { + name: "bar", + prefer: true, + srcs: [":fg"], + }`, + prebuilt: true, + }, } func TestPrebuilts(t *testing.T) { @@ -125,6 +138,7 @@ func TestPrebuilts(t *testing.T) { ctx := NewTestContext() ctx.PreArchMutators(RegisterPrebuiltsPreArchMutators) ctx.PostDepsMutators(RegisterPrebuiltsPostDepsMutators) + ctx.RegisterModuleType("filegroup", ModuleFactoryAdaptor(FileGroupFactory)) ctx.RegisterModuleType("prebuilt", ModuleFactoryAdaptor(newPrebuiltModule)) ctx.RegisterModuleType("source", ModuleFactoryAdaptor(newSourceModule)) ctx.Register() |