From b0127a7f0c8e0e4ad7977797082c1e073790f8fa Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 4 Mar 2016 20:10:52 +0300 Subject: [PATCH] 8151288: Generation of property files for gtk l&f can be skipped on win/osx Reviewed-by: erikj --- jdk/make/gensrc/Gensrc-java.desktop.gmk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jdk/make/gensrc/Gensrc-java.desktop.gmk b/jdk/make/gensrc/Gensrc-java.desktop.gmk index 05e93c66e3f..42eb1a2fda0 100644 --- a/jdk/make/gensrc/Gensrc-java.desktop.gmk +++ b/jdk/make/gensrc/Gensrc-java.desktop.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 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 @@ -62,7 +62,9 @@ endif ifeq ($(OPENJDK_TARGET_OS), windows) PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows -else +endif + +ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), ) PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources endif