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

Commit 230090cc authored Jul 02, 2020 by Orion Hodson

Remove remaining libnativehelper implicit includes

Bug: 152482542
Test: m checkbuild
Change-Id: Ieded4b0e3906ef625b3bb6cf0dd1a3e178dd320c

parent 1a1b8853

cc/config/global.go

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -213,10 +213,6 @@ func init() {
	"frameworks/native/opengl/include",		"frameworks/native/opengl/include",
	"frameworks/av/include",		"frameworks/av/include",
	})		})
	// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help
	// with this, since there is no associated library.
	pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I",
	[]string{"libnativehelper/include_jni"})

	pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)		pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
	pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {		pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {

cc/makevars.go

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -153,16 +153,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
	ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")		ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")
	ctx.Strict("XZ", "${xzCmd}")		ctx.Strict("XZ", "${xzCmd}")

	nativeHelperIncludeFlags, err := ctx.Eval("${config.CommonNativehelperInclude}")
	if err != nil {
	panic(err)
	}
	nativeHelperIncludes, nativeHelperSystemIncludes := splitSystemIncludes(ctx, nativeHelperIncludeFlags)
	if len(nativeHelperSystemIncludes) > 0 {
	panic("native helper may not have any system includes")
	}
	ctx.Strict("JNI_H_INCLUDE", strings.Join(nativeHelperIncludes, " "))

	includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")		includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")
	if err != nil {		if err != nil {
	panic(err)		panic(err)