Bug 106913 – Upstream iOS changes for ANGLE project

• Status: RESOLVED
• Resolution: FIXED
• Component: ANGLE

[David Kilzer (:ddkilzer)]

Created attachment 182786 [details]
Patch

<http://webkit.org/b/000000>

Reviewed by NOBODY (OOPS!).

* ANGLE.xcodeproj/project.pbxproj:
- Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
- Add iOS.xcconfig to project.
* Configurations/ANGLE.xcconfig:
- Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH.  (See below.)
- Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
* Configurations/Base.xcconfig:
- Include iOS.xcconfig.
- Add per-platform values for GCC_ENABLE_OBJC_GC and
GCC_MODEL_TUNING.
- Define INSTALL_PATH when building for macosx SDK.
* Configurations/iOS.xcconfig: Add.  Note that missing include
files are sipmly ignored without an error by Xcode.
---
 5 files changed, 39 insertions(+), 6 deletions(-)

[David Kilzer (:ddkilzer)]

Some additional notes:

- There were no other code changes to ANGLE in iOS--only these build file changes.

- The INSTALL_PATH_ACTUAL and INSTALL_PATH_PREFIX changes are required for iOS Simulator builds at Apple to make sure they end up in /Applications/Xcode.app/Contents/$(SDKROOT).  The definition of INSTALL_PATH in Base.xcconfig is required to make these changes work with Mac OS X builds.

- Missing #include files in *.xcconfig files (like iOS.xcconfig) are not build errors.

[Joseph Pecoraro]

Comment on attachment 182786 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=182786&action=review

r=me

> Source/ThirdParty/ANGLE/ChangeLog:4
> +        <http://webkit.org/b/000000>

Nit: Update the bug link before landing

> Source/ThirdParty/ANGLE/ChangeLog:20
> +        files are sipmly ignored without an error by Xcode.

Typo: sipmly

> Source/ThirdParty/ANGLE/Configurations/Base.xcconfig:14
> +GCC_ENABLE_OBJC_GC_iphonesimulator = NO;

Nit: Normally the _iphonesimulator version just uses the _iphoneos version, so:

    GCC_ENABLE_OBJC_GC_iphonesimulator = $(GCC_ENABLE_OBJC_GC_iphoneos)

Up to you on making this change. That just seems to be the existing convention but it doesn't seem necessary.

[David Kilzer (:ddkilzer)]

Committed r139761: <http://trac.webkit.org/changeset/139761>

[David Kilzer (:ddkilzer)]

(In reply to comment #3)
> Committed r139761: <http://trac.webkit.org/changeset/139761>

Related build fix in r139784:  <http://trac.webkit.org/changeset/139784 >