Merge branch 'ms-patches/win-aarch64-build-error-8329348' into releas…

…e/jdk-11.0.24-ga

make/Main.gmk

@@ -109,6 +109,17 @@ ALL_TARGETS += generate-exported-symbols
 # When creating a BUILDJDK, the java targets have already been built and copied
 # into the buildjdk so no need to generate sources.
 ifneq ($(CREATING_BUILDJDK), true)
+  GENERATE_BUILDJDK_SOURCES := true
+else ifeq ($(OPENJDK_TARGET_OS)+$(COMPILE_TYPE), windows+cross)
+ # Windows AArch64 is built by cross compiling. Therefore, the buildjdk sources
+ # need to be generated unconditionally to avoid a 'No rule to make target
+ # windows/conf/tzmappings' error
+  GENERATE_BUILDJDK_SOURCES := true
+else
+  GENERATE_BUILDJDK_SOURCES :=
+endif
+
+ifeq ($(GENERATE_BUILDJDK_SOURCES), true)
   $(eval $(call DeclareRecipesForPhase, GENSRC, \
       TARGET_SUFFIX := gensrc-src, \
       FILE_PREFIX := Gensrc, \
@@ -765,7 +776,7 @@ else
   # Skip modules that do not have java source.
   # When creating a BUILDJDK, the java compilation has already been done by the
   # normal build and copied in.
-  ifneq ($(CREATING_BUILDJDK), true)
+  ifeq ($(GENERATE_BUILDJDK_SOURCES), true)
     $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
   endif
 

ms-patches/win-aarch64-build-error-8329348.yml

@@ -0,0 +1,12 @@
+title: Fix Windows AArch64 jdk11u build error
+- work_item: 1993805
+- jbs_bug: JDK-8329348
+- author: swesonga
+- owner: swesonga
+- contributors:
+- details:
+  - Fixes the Windows AArch64 jdk11u build error 'No rule to make target .../windows/conf/tzmappings'.
+  - The root cause of this error is that the GENSRC_TARGETS are not built.
+  - This fix removes checks for CREATING_BUILDJDK to ensure that the GENSRC_TARGETS are built unconditionally.
+  - These checks were also found to be incorrect in https://bugs.openjdk.org/browse/JDK-8217739
+- release_note: