make/launcher/Launcher-java.base.gmk
branchmetal-prototype-branch
changeset 57357 f3beca8f19fc
parent 54548 b057e09eef80
equal deleted inserted replaced
57251:86ed45a9dedb 57357:f3beca8f19fc
     1 #
     1 #
     2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     2 # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4 #
     4 #
     5 # This code is free software; you can redistribute it and/or modify it
     5 # This code is free software; you can redistribute it and/or modify it
     6 # under the terms of the GNU General Public License version 2 only, as
     6 # under the terms of the GNU General Public License version 2 only, as
     7 # published by the Free Software Foundation.  Oracle designates this
     7 # published by the Free Software Foundation.  Oracle designates this
    25 
    25 
    26 include LauncherCommon.gmk
    26 include LauncherCommon.gmk
    27 
    27 
    28 $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
    28 $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
    29 
    29 
       
    30 JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
       
    31 
    30 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
    32 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
    31 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
    33 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
    32 
    34 
    33 ################################################################################
    35 ################################################################################
    34 
    36 
    35 # On windows, the debuginfo files get the same name as for java.dll. Build
    37 # On windows, the debuginfo files get the same name as for java.dll. Build
    36 # into another dir and copy selectively so debuginfo for java.dll isn't
    38 # into another dir and copy selectively so debuginfo for java.dll isn't
    37 # overwritten.
    39 # overwritten.
    38 $(eval $(call SetupBuildLauncher, java, \
    40 $(eval $(call SetupBuildLauncher, java, \
    39     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
    41     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
    40     LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \
       
    41     EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
    42     EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
    42     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
    43     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
    43     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \
    44     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \
    44     OPTIMIZATION := HIGH, \
    45     OPTIMIZATION := HIGH, \
    45 ))
    46 ))