Fix using aidl files from filegroups
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
diff --git a/cc/cc_test.go b/cc/cc_test.go
index b451f17..60c33c2 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -2,6 +2,8 @@
import (
"android/soong/android"
+ "android/soong/genrule"
+
"fmt"
"io/ioutil"
"os"
@@ -42,9 +44,11 @@
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 @@
"foo.c": nil,
"bar.c": nil,
"a.proto": nil,
+ "b.aidl": nil,
})
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})