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

Commit 4b0cc8c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix sysprop_library build err when using filegroup"

parents b6fd6f75 da63a493

cc/compiler.go

+0 −5
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { 
		deps = protoDeps(ctx, deps, &compiler.Proto, Bool(compiler.Properties.Proto.Static))

	}



	if compiler.hasSrcExt(".sysprop") {

		deps.HeaderLibs = append(deps.HeaderLibs, "libbase_headers")

		deps.SharedLibs = append(deps.SharedLibs, "liblog")

	}



	if Bool(compiler.Properties.Openmp) {

		deps.StaticLibs = append(deps.StaticLibs, "libomp")

	}

sysprop/sysprop_library.go

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) { 
		Sysprop          struct {

			Platform *bool

		}

		Header_libs []string

		Shared_libs []string

	}{}



	ccProps.Name = proptools.StringPtr(m.CcModuleName())
@@ -130,6 +132,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) { 
	ccProps.Device_specific = proptools.BoolPtr(deviceSpecific)

	ccProps.Product_specific = proptools.BoolPtr(productSpecific)

	ccProps.Sysprop.Platform = proptools.BoolPtr(owner == "Platform")

	ccProps.Header_libs = []string{"libbase_headers"}

	ccProps.Shared_libs = []string{"liblog"}



	ctx.CreateModule(android.ModuleFactoryAdaptor(cc.LibraryFactory), &m.commonProperties, &ccProps)

}