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

Commit 62555ffa authored by Orion Hodson's avatar Orion Hodson Committed by Gerrit Code Review
Browse files

Merge "Remove remaining libnativehelper implicit includes"

parents 2bcb4940 230090cc

cc/config/global.go

+0 −4
Original line number Diff line number Diff line
@@ -215,10 +215,6 @@ func init() { 
			"frameworks/native/opengl/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.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {

cc/makevars.go

+0 −10
Original line number Diff line number Diff line
@@ -154,16 +154,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")

	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}")

	if err != nil {

		panic(err)