Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e197d8b1 authored by Jooyung Han's avatar Jooyung Han
Browse files

Add "aidl.flags:" property for cc_/java_ modules 

The property can be used to pass additional flags to the AIDL compiler.
For example,

  cc_library {
    ..
    srcs: ["Foo.aidl"],
    aidl: {
      flags: [
        "-Werror",      // warnings as error
        "-Weverything", // turn on all warnings
      ],
    },
  }

Bug: 168028537
Test: soong test
Change-Id: I8120eeae7cd7b1acdd34c554af996a29e760a368
parent 591920fc

cc/cc_test.go

+18 −0
Original line number Diff line number Diff line
@@ -4244,3 +4244,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)

	}

}

cc/compiler.go

+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))

java/java.go

+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())

java/java_test.go

+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 {