commit c09c71bc2e0c4f6c256a0506e05a83d76be4858d
author timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jul 02 01:26:22 2020 +0000
committer timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jul 02 01:26:22 2020 +0000
tree e02f8da99b9f335f45682b472d249427463f4686
parent 49e061d8a3dbe8c30f3935dcdd27d7b6b9ae2882

Fix the arm64 iOS simulator build
https://bugs.webkit.org/show_bug.cgi?id=213868
<rdar://problem/64901603>

* Configurations/libvpx.xcconfig:
* Configurations/libwebrtc.xcconfig:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog

diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
index 41acb33..2b86dc3 100644
--- a/Source/ThirdParty/libwebrtc/ChangeLog
+++ b/Source/ThirdParty/libwebrtc/ChangeLog
@@ -1,3 +1,12 @@
+2020-07-01  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the arm64 iOS simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=213868
+        <rdar://problem/64901603>
+
+        * Configurations/libvpx.xcconfig:
+        * Configurations/libwebrtc.xcconfig:
+
 2020-07-01  Youenn Fablet  <youenn@apple.com>
 
         Add a functional WebRTC VP9 codec

Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig

diff --git a/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
index e12497a..d1162aa 100644
--- a/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig
@@ -19,7 +19,6 @@
 ARM_FILES = *_neon.c arm_cpudetect.c *_arm.c
 X86_FILES = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *.asm
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=x86_64] = $(ARM_FILES)
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=arm64*] = $(X86_FILES) *_mmx.c
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=arm64*] = $(X86_FILES) *_mmx.c
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(X86_FILES) $(ARM_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[arch=x86_64] = $(ARM_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = $(X86_FILES) *_mmx.c
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=x86_64] = $(ARM_FILES) $(X86_FILES)

Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
index 464f2f7..a927ff1 100644
--- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
@@ -38,6 +38,7 @@
 
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx) $(EXCLUDED_SOURCE_FILE_NAMES_arm);