8257895: Allow building of JavaFX media libs for Apple Silicon

Co-authored-by: Johan Vos <[email protected]>
Reviewed-by: jvos, kcr

build.gradle

@@ -403,6 +403,9 @@ if (IS_STATIC_BUILD && IS_COMPILE_MEDIA) {
     throw new GradleException("Can not have COMPILE_MEDIA when STATIC_BUILD is enabled");
 }
 
+// By default, target architecture = host architecture, but we allow different ones.
+defineProperty("TARGET_ARCH", OS_ARCH)
+
 // BUILD_TOOLS_DOWNLOAD_SCRIPT specifies a path of a gradle script which downloads
 // required build tools.
 defineProperty("BUILD_TOOLS_DOWNLOAD_SCRIPT", "")
@@ -3295,13 +3298,13 @@ project(":media") {
                     doLast {
                         exec {
                             commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/libffi")
-                            args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=ffi")
+                            args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=ffi", "ARCH=$TARGET_ARCH")
                             args ("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", "AR=${mediaProperties.ar}")
                         }
 
                         exec {
                             commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
-                            args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite")
+                            args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite", "ARCH=$TARGET_ARCH")
                             args ("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}")
                         }
                     }

buildSrc/mac.gradle

@@ -127,7 +127,7 @@ def commonParams = [
         "-arch", "$TARGET_ARCH"]
 
 if (hasProperty('TARGET_ARCH')) {
-    commonParams = ["-target", "${TARGET_ARCH}-apple-macos-11", commonParams]
+    commonParams = ["-target", "${TARGET_ARCH}-apple-macos-11", commonParams].flatten()
 }
 
 def ccBaseFlags = [