.mx.jvmci/suite.py

*** 107,117 ****
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.code",
        ],
        "checkstyle" : "jdk.vm.ci.service",
-       "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
        "javaCompliance" : "1.8",
        "workingSets" : "API,JVMCI",
      },
  
      "jdk.vm.ci.runtime.test" : {
--- 107,116 ----
*** 133,174 ****
        "checkstyle" : "jdk.vm.ci.service",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI",
      },
  
-     "jdk.vm.ci.options" : {
-       "subDir" : "src/jdk.vm.ci/share/classes",
-       "sourceDirs" : ["src"],
-       "checkstyle" : "jdk.vm.ci.service",
-       "dependencies" : ["jdk.vm.ci.inittimer"],
-       "javaCompliance" : "1.8",
-       "workingSets" : "JVMCI",
-     },
- 
-     "jdk.vm.ci.options.processor" : {
-       "subDir" : "src/jdk.vm.ci/share/classes",
-       "sourceDirs" : ["src"],
-       "dependencies" : [
-         "jdk.vm.ci.options",
-       ],
-       "checkstyle" : "jdk.vm.ci.service",
-       "javaCompliance" : "1.8",
-       "workingSets" : "JVMCI,Codegen",
-     },
- 
-     "jdk.vm.ci.options.test" : {
-       "subDir" : "test/compiler/jvmci",
-       "sourceDirs" : ["src"],
-       "dependencies" : [
-         "jdk.vm.ci.options",
-         "mx:JUNIT",
-       ],
-       "checkstyle" : "jdk.vm.ci.service",
-       "javaCompliance" : "1.8",
-       "workingSets" : "JVMCI",
-     },
- 
      # ------------- JVMCI:HotSpot -------------
  
      "jdk.vm.ci.amd64" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
--- 132,141 ----
*** 189,207 ****
  
      "jdk.vm.ci.hotspot" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
-         "jdk.vm.ci.options",
          "jdk.vm.ci.hotspotvmconfig",
          "jdk.vm.ci.common",
          "jdk.vm.ci.runtime",
          "jdk.vm.ci.service",
        ],
-       "annotationProcessors" : [
-         "JVMCI_OPTIONS_PROCESSOR",
-       ],
        "checkstyle" : "jdk.vm.ci.service",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI",
      },
  
--- 156,171 ----
  
      "jdk.vm.ci.hotspot" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.hotspotvmconfig",
          "jdk.vm.ci.common",
+         "jdk.vm.ci.inittimer",
          "jdk.vm.ci.runtime",
          "jdk.vm.ci.service",
        ],
        "checkstyle" : "jdk.vm.ci.service",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI",
      },
  
*** 256,281 ****
      "JVMCI_SERVICE" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "dependencies" : ["jdk.vm.ci.service"],
      },
  
-     "JVMCI_OPTIONS" : {
-       "subDir" : "src/jdk.vm.ci/share/classes",
-       "dependencies" : ["jdk.vm.ci.options"],
-     },
- 
      "JVMCI_API" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "dependencies" : [
          "jdk.vm.ci.inittimer",
          "jdk.vm.ci.runtime",
          "jdk.vm.ci.common",
          "jdk.vm.ci.amd64",
          "jdk.vm.ci.sparc",
        ],
        "distDependencies" : [
-         "JVMCI_OPTIONS",
          "JVMCI_SERVICE",
        ],
      },
  
      "JVMCI_HOTSPOTVMCONFIG" : {
--- 220,239 ----
*** 299,324 ****
      },
  
      "JVMCI_TEST" : {
        "subDir" : "test/compiler/jvmci",
        "dependencies" : [
-         "jdk.vm.ci.options.test",
          "jdk.vm.ci.runtime.test",
        ],
        "distDependencies" : [
          "JVMCI_API",
        ],
        "exclude" : ["mx:JUNIT"],
      },
  
-     "JVMCI_OPTIONS_PROCESSOR" : {
-       "subDir" : "src/jdk.vm.ci/share/classes",
-       "dependencies" : ["jdk.vm.ci.options.processor"],
-       "distDependencies" : [
-         "JVMCI_OPTIONS",
-       ],
-     },
  
      "JVMCI_SERVICE_PROCESSOR" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "dependencies" : ["jdk.vm.ci.service.processor"],
        "distDependencies" : [
--- 257,274 ----
*** 330,358 ****
      # using the -Xoverride option in JDK9.
      "JVMCI" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "overlaps" : [
          "JVMCI_API",
-         "JVMCI_OPTIONS",
          "JVMCI_SERVICE",
          "JVMCI_HOTSPOT",
          "JVMCI_HOTSPOTVMCONFIG",
          "JVMCI_SERVICE_PROCESSOR",
-         "JVMCI_OPTIONS_PROCESSOR"
        ],
        "dependencies" : [
-         "jdk.vm.ci.options",
          "jdk.vm.ci.service",
          "jdk.vm.ci.inittimer",
          "jdk.vm.ci.runtime",
          "jdk.vm.ci.common",
          "jdk.vm.ci.amd64",
          "jdk.vm.ci.sparc",
          "jdk.vm.ci.hotspotvmconfig",
          "jdk.vm.ci.hotspot.amd64",
          "jdk.vm.ci.hotspot.sparc",
-         "jdk.vm.ci.options.processor",
          "jdk.vm.ci.service.processor"
        ],
      },
    },
  }
--- 280,304 ----