diff options
| -rw-r--r-- | cc/binary.go | 3 | ||||
| -rw-r--r-- | cc/sanitize.go | 4 | ||||
| -rw-r--r-- | java/droiddoc.go | 19 |
3 files changed, 8 insertions, 18 deletions
diff --git a/cc/binary.go b/cc/binary.go index 4a6eb9313..0303d9adf 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -216,9 +216,6 @@ func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags if ctx.Host() && !binary.static() { if !ctx.Config().IsEnvTrue("DISABLE_HOST_PIE") { flags.LdFlags = append(flags.LdFlags, "-pie") - if ctx.Windows() { - flags.LdFlags = append(flags.LdFlags, "-Wl,-e_mainCRTStartup") - } } } diff --git a/cc/sanitize.go b/cc/sanitize.go index 080ac094b..4c8a6114a 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -155,7 +155,9 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { if ctx.clang() { if ctx.Host() { - globalSanitizers = ctx.Config().SanitizeHost() + if !ctx.Windows() { + globalSanitizers = ctx.Config().SanitizeHost() + } } else { arches := ctx.Config().SanitizeDeviceArch() if len(arches) == 0 || inList(ctx.Arch().ArchType.Name, arches) { diff --git a/java/droiddoc.go b/java/droiddoc.go index e0e8612fe..1eb935f19 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -646,20 +646,11 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { if !Bool(d.properties.Metalava_enabled) { javaVersion = "1.8" } - if javaVersion == "1.9" { - if len(deps.bootClasspath) > 0 { - var systemModules classpath - if deps.systemModules != nil { - systemModules = append(systemModules, deps.systemModules) - } - bootClasspathArgs = systemModules.FormJavaSystemModulesPath("--system ", ctx.Device()) - bootClasspathArgs = bootClasspathArgs + " --patch-module java.base=." - } - } else { - if len(deps.bootClasspath.Strings()) > 0 { - // For OpenJDK 8 we can use -bootclasspath to define the core libraries code. - bootClasspathArgs = deps.bootClasspath.FormJavaClassPath("-bootclasspath") - } + // continue to use -bootclasspath even if Metalava under -source 1.9 is enabled + // since it doesn't support system modules yet. + if len(deps.bootClasspath.Strings()) > 0 { + // For OpenJDK 8 we can use -bootclasspath to define the core libraries code. + bootClasspathArgs = deps.bootClasspath.FormJavaClassPath("-bootclasspath") } classpathArgs := deps.classpath.FormJavaClassPath("-classpath") |