8149647: Incremental enhancements from build-infra
Reviewed-by: erikj
This commit is contained in:
parent
df4d1c44ff
commit
24656787c0
hotspot
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -29,6 +29,10 @@ $(eval $(call IncludeCustomExtension, hotspot, lib/Lib-jdk.hotspot.agent.gmk))
|
||||
|
||||
################################################################################
|
||||
|
||||
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
|
||||
DISABLE_MAPFILES := true
|
||||
endif
|
||||
|
||||
SA_TOPDIR := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent
|
||||
|
||||
# Defaults for most platforms
|
||||
|
@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
|
||||
// Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
//
|
||||
// This code is free software; you can redistribute it and/or modify it
|
||||
@ -19,7 +19,7 @@
|
||||
// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
// or visit www.oracle.com if you need additional information or have any
|
||||
// questions.
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
#include "winresrc.h"
|
||||
@ -36,7 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION HS_VER
|
||||
FILEVERSION JDK_VER
|
||||
PRODUCTVERSION JDK_VER
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
@ -56,7 +56,7 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", XSTR(HS_COMPANY) "\0"
|
||||
VALUE "FileDescription", XSTR(HS_FILEDESC) "\0"
|
||||
VALUE "FileVersion", XSTR(HS_DOTVER) "\0"
|
||||
VALUE "FileVersion", XSTR(JDK_DOTVER) "\0"
|
||||
VALUE "Full Version", XSTR(HS_BUILD_ID) "\0"
|
||||
VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0"
|
||||
VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0"
|
||||
|
Loading…
x
Reference in New Issue
Block a user