From c9cde87961bda3091b2c3b20a694b357e451a876 Mon Sep 17 00:00:00 2001
From: ccheung <unknown>
Date: Tue, 9 Nov 2010 23:05:33 -0800
Subject: [PATCH] 6992226: Missing windows COMPANY file property settings
 Reviewed-by: ohair

---
 make/common/Defs.gmk | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk
index 31e3a4a8f..71ab366ab 100644
--- a/make/common/Defs.gmk
+++ b/make/common/Defs.gmk
@@ -83,14 +83,19 @@ ifndef CLOSED_SRC
   CLOSED_SRC  = $(BUILDDIR)/../src/closed
 endif
 
-# If we have no closed directory, force it to an openjdk build
-CLOSED_SRC_DIR_EXISTS := $(shell \
-  if [ -d $(CLOSED_SRC) ] ; then \
-    echo true; \
-  else \
-    echo false; \
-  fi)
-ifeq ($(CLOSED_SRC_DIR_EXISTS), false)
+# If CLOSE_SRC_INCLUDED isn't set to true, check if there's any
+# closed directory.
+ifneq ($(CLOSED_SRC_INCLUDED), true)
+  CLOSED_SRC_INCLUDED := $(shell \
+    if [ -d $(CLOSED_SRC) ] ; then \
+      echo true; \
+    else \
+      echo false; \
+    fi)
+endif
+
+# Set OPENJDK based on CLOSED_SRC_INCLUDED
+ifeq ($(CLOSED_SRC_INCLUDED), false)
   OPENJDK = true
 endif
 
-- 
GitLab