Revert "fixed iOS build failure"
This reverts commit 83cd50b8afb0769154321ad39866f699c2c28e1e.
Reason for revert: Need to revert previous SkSL CL
Original change's description:
> fixed iOS build failure
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4997
>
> Change-Id: I5c3727c5dc0e30ae88e1879e12547bdb11db97ee
> Reviewed-on: https://skia-review.googlesource.com/4997
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Iaafb7abae666556132211e6d49766e629dbec9ba
Reviewed-on: https://skia-review.googlesource.com/5076
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/gyp/sksl.gyp b/gyp/sksl.gyp
index da0cdff..5ec2979 100644
--- a/gyp/sksl.gyp
+++ b/gyp/sksl.gyp
@@ -10,15 +10,13 @@
'standalone_static_library': 1,
'sources': [ '<!@(python read_gni.py ../gn/sksl.gni skia_sksl_sources)' ],
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/gpu',
- '../include/private',
- '../include/utils',
- '../src/core',
- '../src/gpu',
- '../src/sksl',
- '../src/utils',
+ '../include/config',
+ '../include/core',
+ '../include/gpu',
+ '../include/private',
+ '../include/utils',
+ '../src/gpu',
+ '../src/sksl',
],
'defines': [
'SKIA'
diff --git a/gyp/skslc.gyp b/gyp/skslc.gyp
index 04cca61..6f9ed60 100644
--- a/gyp/skslc.gyp
+++ b/gyp/skslc.gyp
@@ -11,14 +11,13 @@
'target_name': 'skslc',
'type': 'executable',
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/gpu',
- '../include/private',
- '../include/utils',
- '../src/core',
- '../src/gpu',
- '../src/utils',
+ '../include/config',
+ '../include/core',
+ '../include/gpu',
+ '../include/private',
+ '../include/utils',
+ '../src/gpu',
+ '../src/sksl',
],
'sources': [
'<!@(python read_gni.py ../gn/sksl.gni skia_sksl_sources)',