make/gensrc/Gensrc-jdk.jdi.gmk

rev 11065 : 8066589: Make importing sa-jdi.jar optional on its existance
Summary: Also fix the location where libjli_static.a is loaded from on AIX
Reviewed-by: erikj

*** 76,87 ****
  # Copy the same service file into jdk.hotspot.agent so that they are kept the same.
  $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector: \
      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector
          $(install-file)
  
! GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
      $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
  
  ################################################################################
  
  include GensrcProperties.gmk
  
--- 76,92 ----
  # Copy the same service file into jdk.hotspot.agent so that they are kept the same.
  $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector: \
      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector
          $(install-file)
  
! # Some platforms don't have the serviceability agent
! ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
!   ifneq ($(JVM_VARIANT_ZERO), true)
!     GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
          $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
+   endif
+ endif
  
  ################################################################################
  
  include GensrcProperties.gmk