StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix using aidl files from filegroups

Browse Source 
Compute sources including from filegroup and genrule dependencies
before determining if any sources will cause flags to be added.

Test: gen_test.go
Change-Id: I0434b003bbda07a58bb2ce1a0a72997918c8fae2
This commit is contained in:
Colin Cross
2017-11-16 14:33:08 -08:00
parent ad59e75a56
commit f18e11074d
8 changed files with 101 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/cc_test.go
View File

@@ -2,6 +2,8 @@ package cc
import (
"android/soong/android"
"android/soong/genrule"
"fmt"
"io/ioutil"
"os"
@@ -42,9 +44,11 @@ func testCc(t *testing.T, bp string) *android.TestContext {
ctx := android.NewTestArchContext()
ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(LibraryFactory))
ctx.RegisterModuleType("cc_library_shared", android.ModuleFactoryAdaptor(LibrarySharedFactory))
ctx.RegisterModuleType("toolchain_library", android.ModuleFactoryAdaptor(toolchainLibraryFactory))
ctx.RegisterModuleType("llndk_library", android.ModuleFactoryAdaptor(llndkLibraryFactory))
ctx.RegisterModuleType("cc_object", android.ModuleFactoryAdaptor(objectFactory))
ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(genrule.FileGroupFactory))
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("image", vendorMutator).Parallel()
ctx.BottomUp("link", linkageMutator).Parallel()
@@ -119,6 +123,7 @@ func testCc(t *testing.T, bp string) *android.TestContext {
"foo.c": nil,
"bar.c": nil,
"a.proto": nil,
"b.aidl": nil,
})
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})