Use aquery to declare bazel actions in the ninja file.
This effectively moves execution of Bazel actions outside of soong_build and alongside ninja execution of the actual ninja files, whether that be by ninja or by Bazel itself. This almost allows for mixed builds and Bazel-as-Ninja-executor to coexist, but requires hacks explained in b/175307058. Test: Treehugger Test: lunch aosp_flame && USE_BAZEL_ANALYSIS=1 m libc Test: lunch aosp_flame && USE_BAZEL=1 USE_BAZEL_ANALYSIS=1 m libc, though this requires a hack of the main BUILD file. See b/175307058 Change-Id: Ia2f6b0f1057e8cea3809de66d8287f13d84b510c
This commit is contained in:
@@ -736,7 +736,8 @@ func TestGenruleWithBazel(t *testing.T) {
|
||||
}
|
||||
gen := ctx.ModuleForTests("foo", "").Module().(*Module)
|
||||
|
||||
expectedOutputFiles := []string{"bazelone.txt", "bazeltwo.txt"}
|
||||
expectedOutputFiles := []string{"outputbase/execroot/__main__/bazelone.txt",
|
||||
"outputbase/execroot/__main__/bazeltwo.txt"}
|
||||
if !reflect.DeepEqual(gen.outputFiles.Strings(), expectedOutputFiles) {
|
||||
t.Errorf("Expected output files: %q, actual: %q", expectedOutputFiles, gen.outputFiles)
|
||||
}
|
||||
|
Reference in New Issue
Block a user