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

Commit 62ed3dd5 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Rename export_headers of cc_api_variant 

Rename export_headers of cc_api_variant as export_include_dirs, because
the property only supports header directory.

Bug: 244244438
Test: Cuttlefish vendor build succeeded
Change-Id: I6e1468f51694150c70d3b0def2917f0ba74f7ea0
parent a8ad378a

cc/library_stub.go

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ func (d *apiLibraryDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps 
				// Copy LLDNK properties to cc_api_library module

				d.libraryDecorator.flagExporter.Properties.Export_include_dirs = append(

					d.libraryDecorator.flagExporter.Properties.Export_include_dirs,

					variantMod.exportProperties.Export_headers...)

					variantMod.exportProperties.Export_include_dirs...)



				// Export headers as system include dirs if specified. Mostly for libc

				if Bool(variantMod.exportProperties.Export_headers_as_system) {
@@ -203,7 +203,7 @@ func (d *apiLibraryDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps 
				// Copy NDK properties to cc_api_library module

				d.libraryDecorator.flagExporter.Properties.Export_include_dirs = append(

					d.libraryDecorator.flagExporter.Properties.Export_include_dirs,

					variantMod.exportProperties.Export_headers...)

					variantMod.exportProperties.Export_include_dirs...)

			}

		}

	}
@@ -362,7 +362,7 @@ type ccApiexportProperties struct { 


type variantExporterProperties struct {

	// Header directory to export

	Export_headers []string `android:"arch_variant"`

	Export_include_dirs []string `android:"arch_variant"`



	// Export all headers as system include

	Export_headers_as_system *bool

cc/library_stub_test.go

+8 −8
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ func TestApiLibraryWithLlndkVariant(t *testing.T) { 
			name: "libbar",

			variant: "llndk",

			src: "libbar_llndk.so",

			export_headers: ["libbar_llndk_include"]

			export_include_dirs: ["libbar_llndk_include"]

		}



		api_imports {
@@ -370,7 +370,7 @@ func TestApiLibraryWithNdkVariant(t *testing.T) { 
			variant: "ndk",

			version: "29",

			src: "libbar_ndk_29.so",

			export_headers: ["libbar_ndk_29_include"]

			export_include_dirs: ["libbar_ndk_29_include"]

		}



		cc_api_variant {
@@ -378,7 +378,7 @@ func TestApiLibraryWithNdkVariant(t *testing.T) { 
			variant: "ndk",

			version: "30",

			src: "libbar_ndk_30.so",

			export_headers: ["libbar_ndk_30_include"]

			export_include_dirs: ["libbar_ndk_30_include"]

		}



		cc_api_variant {
@@ -386,7 +386,7 @@ func TestApiLibraryWithNdkVariant(t *testing.T) { 
			variant: "ndk",

			version: "current",

			src: "libbar_ndk_current.so",

			export_headers: ["libbar_ndk_current_include"]

			export_include_dirs: ["libbar_ndk_current_include"]

		}



		api_imports {
@@ -458,7 +458,7 @@ func TestApiLibraryWithMultipleVariants(t *testing.T) { 
			variant: "ndk",

			version: "29",

			src: "libbar_ndk_29.so",

			export_headers: ["libbar_ndk_29_include"]

			export_include_dirs: ["libbar_ndk_29_include"]

		}



		cc_api_variant {
@@ -466,7 +466,7 @@ func TestApiLibraryWithMultipleVariants(t *testing.T) { 
			variant: "ndk",

			version: "30",

			src: "libbar_ndk_30.so",

			export_headers: ["libbar_ndk_30_include"]

			export_include_dirs: ["libbar_ndk_30_include"]

		}



		cc_api_variant {
@@ -474,14 +474,14 @@ func TestApiLibraryWithMultipleVariants(t *testing.T) { 
			variant: "ndk",

			version: "current",

			src: "libbar_ndk_current.so",

			export_headers: ["libbar_ndk_current_include"]

			export_include_dirs: ["libbar_ndk_current_include"]

		}



		cc_api_variant {

			name: "libbar",

			variant: "llndk",

			src: "libbar_llndk.so",

			export_headers: ["libbar_llndk_include"]

			export_include_dirs: ["libbar_llndk_include"]

		}



		api_imports {