diff options
| -rw-r--r-- | cc/config/global.go | 4 | ||||
| -rw-r--r-- | cc/makevars.go | 10 | ||||
| -rwxr-xr-x | scripts/build-mainline-modules.sh | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index fa8e0fba2..d47e0ce5a 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -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 { diff --git a/cc/makevars.go b/cc/makevars.go index 8301c6b38..48d563606 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -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) diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh index 6db870f5a..ea62af4a2 100755 --- a/scripts/build-mainline-modules.sh +++ b/scripts/build-mainline-modules.sh @@ -26,6 +26,7 @@ MODULES_SDK_AND_EXPORTS=( platform-mainline-test-exports runtime-module-host-exports runtime-module-sdk + tzdata-module-test-exports ) # List of libraries installed on the platform that are needed for ART chroot |