Add module dir to includes for cc_preprocess_no_configuration
This is needed to create the same behavior as other cc modules.
Bug: 372091092
Test: go test
Change-Id: I2c15dbc2c6a2b2ba693ef0f2a732525dd2f72d0f
diff --git a/cc/cc_preprocess_no_configuration.go b/cc/cc_preprocess_no_configuration.go
index 3d1d0a5..3d4b077 100644
--- a/cc/cc_preprocess_no_configuration.go
+++ b/cc/cc_preprocess_no_configuration.go
@@ -16,6 +16,7 @@
import (
"android/soong/android"
+ "slices"
"strings"
)
@@ -78,6 +79,12 @@
return
}
+ cflags := slices.Clone(m.properties.Cflags)
+
+ // Match behavior of other cc modules:
+ // https://cs.android.com/android/platform/superproject/main/+/main:build/soong/cc/compiler.go;l=422;drc=7297f05ee8cda422ccb32c4af4d9d715d6bac10e
+ cflags = append(cflags, "-I"+ctx.ModuleDir())
+
var ccCmd string
switch src.Ext() {
case ".c":
@@ -99,7 +106,7 @@
Output: outFile,
Input: src,
Args: map[string]string{
- "cFlags": strings.Join(m.properties.Cflags, " "),
+ "cFlags": strings.Join(cflags, " "),
"ccCmd": ccCmd,
},
})
diff --git a/cc/cc_preprocess_no_configuration_test.go b/cc/cc_preprocess_no_configuration_test.go
index 43e726d..c6eae4c 100644
--- a/cc/cc_preprocess_no_configuration_test.go
+++ b/cc/cc_preprocess_no_configuration_test.go
@@ -20,21 +20,24 @@
)
func TestCcPreprocessNoConfiguration(t *testing.T) {
+ bp := `
+ cc_preprocess_no_configuration {
+ name: "foo",
+ srcs: ["main.cc"],
+ cflags: ["-E", "-DANDROID"],
+ }
+ `
+
fixture := android.GroupFixturePreparers(
android.PrepareForIntegrationTestWithAndroid,
android.FixtureRegisterWithContext(RegisterCCPreprocessNoConfiguration),
+ android.FixtureAddTextFile("foo/bar/Android.bp", bp),
)
- result := fixture.RunTestWithBp(t, `
-cc_preprocess_no_configuration {
- name: "foo",
- srcs: ["main.cc"],
- cflags: ["-E", "-DANDROID"],
-}
-`)
+ result := fixture.RunTest(t)
foo := result.ModuleForTests("foo", "")
actual := foo.Rule("cc").Args["cFlags"]
- expected := "-E -DANDROID"
+ expected := "-E -DANDROID -Ifoo/bar"
android.AssertStringEquals(t, "cflags should be correct", expected, actual)
}