fcd5fddb02
This reverts commitfad9e3f541. Reason for revert: Can't find the error message anymore (?!?) Let's try again shall we Original change's description: > Revert "Update skia to use ifdefs for Vulkan code instead of dummy header" > > This reverts commitc0f8e426c5. > > Reason for revert: Experiment to see if this will unblock the Android roll > > Original change's description: > > Update skia to use ifdefs for Vulkan code instead of dummy header > > > > Bug: skia:6721 > > Change-Id: I80a4c9f2acc09c174497f625c50ed12a8bb76505 > > Reviewed-on: https://skia-review.googlesource.com/19547 > > Reviewed-by: Mike Klein <mtklein@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com > > Change-Id: Ib51c1672570f2071a17b6fbde692a5174b0358ce > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:6721 > Reviewed-on: https://skia-review.googlesource.com/19724 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Iecef7ddcfe31d82938336120a4193525ac6693be No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:6721 Reviewed-on: https://skia-review.googlesource.com/19782 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
51 lines
1.4 KiB
Python
Executable File
51 lines
1.4 KiB
Python
Executable File
#!/usr/bin/env python
|
|
#
|
|
# Copyright 2016 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
import os
|
|
import sys
|
|
|
|
# We'll recursively search each include directory for headers,
|
|
# then write them to skia.h with a small blacklist.
|
|
|
|
# We'll also write skia.h.deps, which Ninja uses to track dependencies. It's the
|
|
# very same mechanism Ninja uses to know which .h files affect which .cpp files.
|
|
|
|
skia_h = sys.argv[1]
|
|
include_dirs = sys.argv[2:]
|
|
|
|
blacklist = {
|
|
"GrGLConfig_chrome.h",
|
|
"SkFontMgr_fontconfig.h",
|
|
}
|
|
|
|
headers = []
|
|
for directory in include_dirs:
|
|
for f in os.listdir(directory):
|
|
if os.path.isfile(os.path.join(directory, f)):
|
|
if f.endswith('.h') and f not in blacklist:
|
|
headers.append(os.path.join(directory,f))
|
|
headers.sort()
|
|
|
|
with open(skia_h, "w") as f:
|
|
f.write('// skia.h generated by GN.\n')
|
|
f.write('#ifndef skia_h_DEFINED\n')
|
|
f.write('#define skia_h_DEFINED\n')
|
|
for h in headers:
|
|
f.write('#include "' + h + '"\n')
|
|
f.write('#endif//skia_h_DEFINED\n')
|
|
|
|
with open(skia_h + '.deps', "w") as f:
|
|
f.write(skia_h + ':')
|
|
for h in headers:
|
|
f.write(' ' + h)
|
|
f.write('\n')
|
|
|
|
# Temporary: during development this file wrote skia.h.d, not skia.h.deps,
|
|
# and I think we have some bad versions of those files laying around.
|
|
if os.path.exists(skia_h + '.d'):
|
|
os.remove(skia_h + '.d')
|