Mercurial > hg > graal-jvmci-8
comparison make/defs.make @ 22394:528eeeca785e
Merge.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Wed, 29 Jul 2015 10:36:54 +0200 |
parents | 697b6b4a7f57 1884fa0c912e |
children | 4f6caa445b92 |
comparison
equal
deleted
inserted
replaced
22335:8217ef77a80a | 22394:528eeeca785e |
---|---|
367 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/jvmci-service.jar | 367 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/jvmci-service.jar |
368 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/jvmci-api.jar | 368 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/jvmci-api.jar |
369 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/jvmci-hotspot.jar | 369 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/jvmci-hotspot.jar |
370 | 370 |
371 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.HotSpotJVMCIBackendFactory | 371 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.HotSpotJVMCIBackendFactory |
372 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.HotSpotVMEventListener | |
373 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.debug.TTYStreamProvider | |
374 | 372 |
375 ifneq ("$(wildcard $(SHARED_DIR)/services/jdk.internal.jvmci.hotspot.events.EventProvider)","") | 373 ifneq ("$(wildcard $(SHARED_DIR)/services/jdk.internal.jvmci.hotspot.events.EventProvider)","") |
376 CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.events.EventProvider | 374 CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.events.EventProvider |
377 endif | 375 endif |
378 | 376 |