feat(import_cc): add includes property

Change-Id: I505d42fe9f4ed53c38a85782705e0f44d84f9fa2

Author: BrandonThomasJonesARM

core/import_cc.go

@@ -19,6 +19,7 @@ type ImportCCProps struct {
 	Target   toolchain.TgtType
 	Linkopts []string
 	Defines  []string
+	Includes []string
 }
 
 type ModuleImportCC struct {
@@ -34,6 +35,7 @@ var _ splittable = (*ModuleImportCC)(nil)
 type importCCInterface interface {
 	splittable
 	file.Provider
+	flag.Provider
 }
 
 func (m *ModuleImportCC) shortName() string {
@@ -43,6 +45,7 @@ func (m *ModuleImportCC) shortName() string {
 func (m *ModuleImportCC) processPaths(ctx blueprint.BaseModuleContext) {
 	prefix := projectModuleDir(ctx)
 	m.Properties.Headers = utils.PrefixDirs(m.Properties.Headers, prefix)
+	m.Properties.Includes = utils.PrefixDirs(m.Properties.Includes, prefix)
 }
 
 func (m *ModuleImportCC) OutFiles() (files file.Paths) {
@@ -58,7 +61,7 @@ func (m *ModuleImportCC) OutFiles() (files file.Paths) {
 
 func (m *ModuleImportCC) FlagsOut() (flags flag.Flags) {
 	headerPath := filepath.Join(backend.Get().BuildDir(), "gen", m.shortName())
-	flags = append(flags, flag.FromIncludePathOwned(headerPath, m, flag.TypeInclude))
+	flags = append(flags, flag.FromIncludePathOwned(headerPath, m, flag.TypeInclude|flag.TypeExported))
 	lut := flag.FlagParserTable{
 		{
 			PropertyName: "Defines",
@@ -73,6 +76,11 @@ func (m *ModuleImportCC) FlagsOut() (flags flag.Flags) {
 	}
 	flags = append(flags, flag.ParseFromProperties(nil, lut, m.Properties)...)
 
+	for _, dir := range m.Properties.Includes {
+		fp := file.NewPath(dir, m.Name(), file.TypeHeader)
+		flags = append(flags, flag.FromIncludePath(fp.BuildPath(), flag.TypeInclude|flag.TypeExported))
+	}
+
 	return
 }
 

gendiffer/tests/cc_import/flags/out/linux/build.ninja.out

@@ -80,7 +80,7 @@ default import_lib_a
 # Factory: github.com/ARM-software/bob-build/core.Main.func1.1
 # Defined: build.bp:redacted
 
-m.shared_lib_target.cflags = -DFOO
+m.shared_lib_target.cflags = -DFOO -I${g.bob.BuildDir}/gen/import_lib_a
 m.shared_lib_target.cxxflags = 
 
 build ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o: g.bob.cxx $

gendiffer/tests/cc_import/header_only/app/build.bp

@@ -4,6 +4,9 @@ bob_import_cc {
         "libA/includes/a.h",
         "libA/includes/a2.h",
     ],
+    includes: [
+        "libB/includes",
+    ],
     target: "target",
 }
 

gendiffer/tests/cc_import/header_only/out/linux/build.ninja.out

@@ -94,7 +94,7 @@ default import_lib_b
 # Factory: github.com/ARM-software/bob-build/core.Main.func1.1
 # Defined: build.bp:redacted
 
-m.shared_lib_target.cflags = 
+m.shared_lib_target.cflags = -I${g.bob.BuildDir}/gen/import_lib_a -I${g.bob.SrcDir}/libB/includes
 m.shared_lib_target.cxxflags = 
 
 build ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o: g.bob.cxx $
@@ -107,7 +107,7 @@ build ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o: g.bob.cxx $
 build ${g.bob.BuildDir}/target/shared/shared_lib.so: g.bob.shared_library $
         ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o
     build_wrapper = 
-    ldflags = -Wl,--as-needed -I${g.bob.BuildDir}/gen/import_lib_a
+    ldflags = -Wl,--as-needed -I${g.bob.BuildDir}/gen/import_lib_a -I${g.bob.SrcDir}/libB/includes
     ldlibs = 
     linker = g++
     shared_libs_dir = ${g.bob.BuildDir}/target/shared

tests/cc_import/build.bp

@@ -9,7 +9,9 @@ bob_import_cc {
 
 bob_import_cc {
     name: "import_lib_b",
-    headers: ["libB/includes/b.h"],
+    includes: [
+        "libB/includes",
+    ],
     target: "target",
 }
 
@@ -20,6 +22,7 @@ bob_shared_library {
     ],
     shared_libs: [
         "import_lib_a",
+        "import_lib_b",
     ],
     cflags: [
         "-fPIC",

tests/cc_import/main.cpp

@@ -1,4 +1,5 @@
 #include "libA/includes/a.h"
+#include "b.h"
 int main()
 {
 	if (a_return_true())