Skip to content

Commit

Permalink
[simlauncher] Add missing weak frameworks to simlauncher (#6955)
Browse files Browse the repository at this point in the history
Things often work fine without them but, in a few cases, you can run into
some weird problems.

Add better comments for synchronization... until we add some tests [1]

Replace the following, cancelled PR
* BackgroundTask #6949
* INcomingCallNotifications #6954
* LinkPresentation #6953
* PencilKit #6950
* SoundAnalysis #6952

[1] #6951
  • Loading branch information
spouliot authored Sep 10, 2019
1 parent cd7e293 commit c41a545
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
8 changes: 6 additions & 2 deletions tools/common/Frameworks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,16 @@ public static Frameworks GetiOSFrameworks (Application app)
{ "NaturalLanguage", "NaturalLanguage", 12,0 },
{ "Network", "Network", 12, 0 },

{ "SoundAnalysis", "SoundAnalysis", 13, 0 },
{ "BackgroundTasks", "BackgroundTasks", 13, 0 },
{ "LinkPresentation", "LinkPresentation", 13, 0 },
{ "PencilKit", "PencilKit", 13, 0 },
{ "QuickLookThumbnailing", "QuickLookThumbnailing", 13,0 },
{ "LinkPresentation", "LinkPresentation", 13, 0 },
{ "SoundAnalysis", "SoundAnalysis", 13, 0 },
{ "VisionKit", "VisionKit", 13, 0 },

// the above MUST be kept in sync with simlauncher
// see tools/mtouch/Makefile
// please also keep it sorted to ease comparison
};
}
return ios_frameworks;
Expand Down
19 changes: 14 additions & 5 deletions tools/mtouch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,22 @@ SIMLAUNCHER_FRAMEWORKS = \
\
-weak_framework AuthenticationServices \
-weak_framework CarPlay \
-weak_framework IdentityLookupUI \
-weak_framework NaturalLanguage \
-weak_framework Network \
-weak_framework IdentityLookupUI \
-weak_framework VisionKit \
\
-weak_framework BackgroundTasks \
-weak_framework LinkPresentation \
-weak_framework PencilKit \
-weak_framework QuickLookThumbnailing \
-weak_framework SoundAnalysis \
-weak_framework VisionKit \

# keep the above list of weak_framework
# 1. grouped by iOS versions;
# 2. sorted and
# 3. in sync with the list inside `tools/common/Frameworks.cs`
# except it is no a mistake that GameController and MediaAccessibility (#13636) are not built into simlauncher

# note: there _was_ no CoreAudioKit.framework or Metal.framework for the simulator (before recent iOS9 betas)
# note 2: there's no GameKit, in iOS 9 (beta 3 at least), you're supposed to reference GameCenter instead (looks fixed in beta 4)
Expand All @@ -157,9 +169,6 @@ SIMLAUNCHER_FRAMEWORKS = \
# note 6: Xcode 11 beta 1 shipped without WatchKit.
# note 7: Xcode 11 beta 3 documented that shipping without WatchKit was done on purpose (in the release notes).

# keep the above list of weak_framework in sync with mtouch.cs
# except it is no a mistake that GameController and MediaAccessibility (#13636) are not built into simlauncher

define SimlauncherTemplate

simlauncher$(5)$(1): simlauncher.m $(TOP)/runtime/.libs/ios/libxamarin.a $(BUILD_DESTDIR)/simulator$(4)/lib/libmono$(3)-2.0.a Makefile Xamarin.iOS.registrar.ios.a
Expand Down

1 comment on commit c41a545

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build was (probably) aborted

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Build' 🔥 : hudson.AbortException: script returned exit code 2

🔥 Build failed 🔥

Please sign in to comment.