# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1437658993 -7200
# Node ID 26e2a05f8d958f9ea4973fdfe141397a4c753955
# Parent  240347540e30adc8aab7baebe4b168e26bb547f8
fixed mx_jvmci_makefile to use mx.classpath_entries()

diff -r 240347540e30 -r 26e2a05f8d95 make/jvmci.make
--- a/make/jvmci.make	Thu Jul 23 15:21:26 2015 +0200
+++ b/make/jvmci.make	Thu Jul 23 15:43:13 2015 +0200
@@ -168,7 +168,7 @@
 
 JVMCI_HOTSPOT_JAR = $(TARGET)/jvmci-hotspot.jar
 
-JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-api.jar
+JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-service.jar $(TARGET)/jvmci-api.jar
 
 EXPORTED_FILES += $(JVMCI_HOTSPOT_JAR)
 
diff -r 240347540e30 -r 26e2a05f8d95 mx.jvmci/mx_jvmci_makefile.py
--- a/mx.jvmci/mx_jvmci_makefile.py	Thu Jul 23 15:21:26 2015 +0200
+++ b/mx.jvmci/mx_jvmci_makefile.py	Thu Jul 23 15:43:13 2015 +0200
@@ -80,13 +80,9 @@
     resources = []
     projects = [p for p in dist.archived_deps() if p.isJavaProject()]
     targetPathPrefix = "$(TARGET)/"
-    libraryDeps = [path_dist_relative(l.get_path(False)) for l in [l for l in dist.archived_deps() if l.isLibrary()]]
+    annotationProcessorDeps = set()
 
-    annotationProcessorDeps = set()
-    distDeps = [dep for dep in dist.deps if dep.isDistribution()]
-
-    classPath = [targetPathPrefix + os.path.basename(d.path) for d in distDeps] + libraryDeps \
-        + [path_dist_relative(exclLib.path) for exclLib in dist.excludedLibs]
+    classPath = [targetPathPrefix + os.path.basename(e.path) for e in mx.classpath_entries(dist, includeSelf=False, preferProjects=False)]
     for p in projects:
         projectDir = path_dist_relative(p.dir)
         annotationProcessorDeps.update(p.declaredAnnotationProcessors)
@@ -97,11 +93,9 @@
                 resources.append(metaInf)
 
     sourceLines = sourcesVariableName + " = " + ("\n" + sourcesVariableName + " += ").join(sources)
-    apPaths = []
     apDistNames = []
     apDistVariableNames = []
     for apd in sorted(annotationProcessorDeps):
-        apPaths.append(path_dist_relative(apd.path))
         apDistNames.append(apd.name)
         apDistVariableNames.append("$(" + apd.name + "_JAR)")
     shouldExport = dist in jdkDeployedDists
diff -r 240347540e30 -r 26e2a05f8d95 mx.jvmci/suite.py
--- a/mx.jvmci/suite.py	Thu Jul 23 15:21:26 2015 +0200
+++ b/mx.jvmci/suite.py	Thu Jul 23 15:43:13 2015 +0200
@@ -342,6 +342,7 @@
         "jdk.internal.jvmci.hotspot.jfr",
       ],
       "distDependencies" : [
+        "JVMCI_SERVICE",
         "JVMCI_API",
       ],
     },