build error: SA not excluded for ios and android x86 builds

[gary.adams at oracle.com]

Understood.
A quick build fix is in the pipeline.

On 3/9/16 5:05 PM, Ali Ebrahimi wrote:
> Hi,
>
> I get build error for ios and android x86 buiilds after  recent pushs.
> The root cause is that computations for INCLUDE_SA is repeated in
> common/autoconf/hotspot.m4
> and common/autoconf/jdk-options.m4 files and later overrides former. So we
> have wrong value for INCLUDE_SA.
>
> So I propose following patch that avoid repeated computations and fixes
> build problem.
>
>
> diff --git a/common/autoconf/generated-configure.sh
> b/common/autoconf/generated-configure.sh
> --- a/common/autoconf/generated-configure.sh
> +++ b/common/autoconf/generated-configure.sh
> @@ -4869,7 +4869,7 @@
>   #CUSTOM_AUTOCONF_INCLUDE
>
>   # Do not change or remove the following line, it is needed for consistency
> checks:
> -DATE_WHEN_GENERATED=1457526376
> +DATE_WHEN_GENERATED=1457546376
>
>   ###############################################################################
>   #
> @@ -15877,24 +15877,6 @@
>
>
>
> -  INCLUDE_SA=true
> -  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$OPENJDK_TARGET_OS" = xaix ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$OPENJDK_TARGET_OS" = "xandroid" || test "x$OPENJDK_TARGET_OS"
> = "xios"; then
> -   INCLUDE_SA="false"
> -  fi
> -  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
> -    INCLUDE_SA=false
> -  fi
> -
> -
>    if test "x$OPENJDK_TARGET_OS" = "xmacosx" ||  test "x$OPENJDK_TARGET_OS"
> = "xios" ; then
>       MACOSX_UNIVERSAL="true"
>     fi
> @@ -23309,6 +23291,9 @@
>     if test "x$OPENJDK_TARGET_OS" = xaix ; then
>       INCLUDE_SA=false
>     fi
> +  if test "x$OPENJDK_TARGET_OS" = "xandroid" || test "x$OPENJDK_TARGET_OS"
> = "xios"; then
> +   INCLUDE_SA="false"
> +  fi
>     if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
>       INCLUDE_SA=false
>     fi
> diff --git a/common/autoconf/hotspot.m4 b/common/autoconf/hotspot.m4
> --- a/common/autoconf/hotspot.m4
> +++ b/common/autoconf/hotspot.m4
> @@ -114,24 +114,6 @@
>     AC_SUBST(JVM_VARIANT_ZEROSHARK)
>     AC_SUBST(JVM_VARIANT_CORE)
>
> -  INCLUDE_SA=true
> -  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$OPENJDK_TARGET_OS" = xaix ; then
> -    INCLUDE_SA=false
> -  fi
> -  if test "x$OPENJDK_TARGET_OS" = "xandroid" || test "x$OPENJDK_TARGET_OS"
> = "xios"; then
> -   INCLUDE_SA="false"
> -  fi
> -  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
> -    INCLUDE_SA=false
> -  fi
> -  AC_SUBST(INCLUDE_SA)
> -
>    if test "x$OPENJDK_TARGET_OS" = "xmacosx" ||  test "x$OPENJDK_TARGET_OS"
> = "xios" ; then
>       MACOSX_UNIVERSAL="true"
>     fi
> diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
> --- a/common/autoconf/jdk-options.m4
> +++ b/common/autoconf/jdk-options.m4
> @@ -189,6 +189,9 @@
>     if test "x$OPENJDK_TARGET_OS" = xaix ; then
>       INCLUDE_SA=false
>     fi
> +  if test "x$OPENJDK_TARGET_OS" = "xandroid" || test "x$OPENJDK_TARGET_OS"
> = "xios"; then
> +   INCLUDE_SA="false"
> +  fi
>     if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
>       INCLUDE_SA=false
>     fi
>
>   # Toolchain descriptions
>   TOOLCHAIN_DESCRIPTION_clang="clang/LLVM"
>
>