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

Commit 01a44004 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "header_libs_requirement" 

* changes:
  Add libstagefright_mp3dec_headers to allowed apex deps
  Require libraries in header_libs to be cc_library_header
parents a7671969 3f2fa9b8

apex/allowed_deps.txt

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ libstagefright_m4vh263dec(minSdkVersion:29) 
libstagefright_m4vh263enc(minSdkVersion:29)

libstagefright_metadatautils(minSdkVersion:29)

libstagefright_mp3dec(minSdkVersion:29)

libstagefright_mp3dec_headers(minSdkVersion:29)

libstagefright_mpeg2extractor(minSdkVersion:29)

libstagefright_mpeg2support_nocrypto(minSdkVersion:29)

libstats_jni(minSdkVersion:(no version))

cc/cc.go

+8 −1
Original line number Diff line number Diff line
@@ -2411,7 +2411,14 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 


			switch {

			case libDepTag.header():

				// nothing

				if !ctx.OtherModuleHasProvider(dep, HeaderLibraryInfoProvider) {

					if !ctx.Config().AllowMissingDependencies() {

						ctx.ModuleErrorf("module %q is not a header library", depName)

					} else {

						ctx.AddMissingDependencies([]string{depName})

					}

					return

				}

			case libDepTag.shared():

				if !ctx.OtherModuleHasProvider(dep, SharedLibraryInfoProvider) {

					if !ctx.Config().AllowMissingDependencies() {

cc/library.go

+16 −10
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, 


	ctx.CheckbuildFile(outputFile)



	if library.static() {

		ctx.SetProvider(StaticLibraryInfoProvider, StaticLibraryInfo{

			StaticLibrary: outputFile,

			ReuseObjects:  library.reuseObjects,
@@ -907,6 +908,11 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, 
				Transitive(deps.TranstiveStaticLibrariesForOrdering).

				Build(),

		})

	}



	if library.header() {

		ctx.SetProvider(HeaderLibraryInfoProvider, HeaderLibraryInfo{})

	}



	return outputFile

}

cc/linkable.go

+7 −0
Original line number Diff line number Diff line
@@ -130,6 +130,13 @@ type StaticLibraryInfo struct { 


var StaticLibraryInfoProvider = blueprint.NewProvider(StaticLibraryInfo{})



// HeaderLibraryInfo is a marker provider that identifies a module as a header library.

type HeaderLibraryInfo struct {

}



// HeaderLibraryInfoProvider is a marker provider that identifies a module as a header library.

var HeaderLibraryInfoProvider = blueprint.NewProvider(HeaderLibraryInfo{})



// FlagExporterInfo is a provider to propagate transitive library information

// pertaining to exported include paths and flags.

type FlagExporterInfo struct {

cc/prebuilt.go

+6 −0
Original line number Diff line number Diff line
@@ -190,6 +190,12 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, 
		}

	}



	if p.header() {

		ctx.SetProvider(HeaderLibraryInfoProvider, HeaderLibraryInfo{})



		return nil

	}



	return nil

}