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

Commit 60c0cd9a authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Add header_libs to cc_object"

parents e6d0f62c a37832a3

cc/cc.go

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ type Flags struct { 
}



type ObjectLinkerProperties struct {

	// list of modules that should only provide headers for this module.

	Header_libs []string `android:"arch_variant,variant_prepend"`



	// names of other cc_object modules to link into this module using partial linking

	Objs []string `android:"arch_variant"`
@@ -2083,6 +2086,7 @@ func DefaultsFactory(props ...interface{}) android.Module { 
		&VendorProperties{},

		&BaseCompilerProperties{},

		&BaseLinkerProperties{},

		&ObjectLinkerProperties{},

		&LibraryProperties{},

		&FlagExporterProperties{},

		&BinaryLinkerProperties{},

cc/object.go

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ func (object *objectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 
		deps.LateSharedLibs = append(deps.LateSharedLibs, "libc")

	}



	deps.HeaderLibs = append(deps.HeaderLibs, object.Properties.Header_libs...)

	deps.ObjFiles = append(deps.ObjFiles, object.Properties.Objs...)

	return deps

}