Merge "Add "aidl.flags:" property for cc_/java_ modules" (26ab0f10) · Commits · e / os / android_build_soong

cc/cc_test.go

+18 −0

Original line number	Diff line number	Diff line
		@@ -4356,3 +4356,21 @@ func TestStubsLibReexportsHeaders(t *testing.T) {
		t.Errorf("expected %q in cflags, got %q", "-Iinclude/libbar", cFlags)
		}
		}

		func TestAidlFlagsPassedToTheAidlCompiler(t *testing.T) {
		ctx := testCc(t, `
		cc_library {
		name: "libfoo",
		srcs: ["a/Foo.aidl"],
		aidl: { flags: ["-Werror"], },
		}
		`)

		libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_static")
		manifest := android.RuleBuilderSboxProtoForTests(t, libfoo.Output("aidl.sbox.textproto"))
		aidlCommand := manifest.Commands[0].GetCommand()
		expectedAidlFlag := "-Werror"
		if !strings.Contains(aidlCommand, expectedAidlFlag) {
		t.Errorf("aidl command %q does not contain %q", aidlCommand, expectedAidlFlag)
		}
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,9 @@ type BaseCompilerProperties struct {

		// whether to generate traces (for systrace) for this interface
		Generate_traces *bool

		// list of flags that will be passed to the AIDL compiler
		Flags []string
		}

		Renderscript struct {
		@@ -521,6 +524,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
		}

		if compiler.hasSrcExt(".aidl") {
		flags.aidlFlags = append(flags.aidlFlags, compiler.Properties.Aidl.Flags...)
		if len(compiler.Properties.Aidl.Local_include_dirs) > 0 {
		localAidlIncludeDirs := android.PathsForModuleSrc(ctx, compiler.Properties.Aidl.Local_include_dirs)
		flags.aidlFlags = append(flags.aidlFlags, includeDirsToFlags(localAidlIncludeDirs))

+5 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,9 @@ type CompilerDeviceProperties struct {

		// whether to generate Binder#GetTransaction name method.
		Generate_get_transaction_name *bool

		// list of flags that will be passed to the AIDL compiler
		Flags []string
		}

		// If true, export a copy of the module as a -hostdex module for host testing.
		@@ -872,6 +875,8 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt
		var flags []string
		var deps android.Paths

		flags = append(flags, j.deviceProperties.Aidl.Flags...)

		if aidlPreprocess.Valid() {
		flags = append(flags, "-p"+aidlPreprocess.String())
		deps = append(deps, aidlPreprocess.Path())

+16 −0

Original line number	Diff line number	Diff line
		@@ -2424,6 +2424,22 @@ func TestAidlExportIncludeDirsFromImports(t *testing.T) {
		}
		}

		func TestAidlFlagsArePassedToTheAidlCompiler(t *testing.T) {
		ctx, _ := testJava(t, `
		java_library {
		name: "foo",
		srcs: ["aidl/foo/IFoo.aidl"],
		aidl: { flags: ["-Werror"], },
		}
		`)

		aidlCommand := ctx.ModuleForTests("foo", "android_common").Rule("aidl").RuleParams.Command
		expectedAidlFlag := "-Werror"
		if !strings.Contains(aidlCommand, expectedAidlFlag) {
		t.Errorf("aidl command %q does not contain %q", aidlCommand, expectedAidlFlag)
		}
		}

		func TestDataNativeBinaries(t *testing.T) {
		ctx, config := testJava(t, `
		java_test_host {