AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
02802f64ea
skia2/gyp
History
jvanverth 02802f64ea Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (patchset #4 id:60001 of https://codereview.chromium.org/1215393002/) 
Reason for revert:
Breaking the roll.

E.g. on android_chromium_gn_compile_dbg:

FAILED: /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -MMD -MF obj/skia/ext/libskia.SkMemory_new_handler.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1 -DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DDONT_EMBED_BUILD_METADATA -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DDISABLE_NACL -DENABLE_CONFIGURATION_POLICY -DENABLE_SUPERVISED_USERS=1 -DENABLE_AUTOFILL_DIALOG=1 -DUSE_PROPRIETARY_CODECS -DV8_USE_EXTERNAL_STARTUP_DATA -DVIDEO_HOLE=1 -DMOBILE_SAFE_BROWSING -DSAFE_BROWSING_SERVICE -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H -DCOMPONENT_BUILD -D__GNU_SOURCE=1 -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DSKIA_IMPLEMENTATION=1 -DSK_ARM_HAS_OPTIONAL_NEON -DSK_GAMMA_APPLY_TO_A8 -DSK_GAMMA_EXPONENT=1.4 -DSK_GAMMA_CONTRAST=0.0 -DSK_DEFAULT_FONT_CACHE_LIMIT=1048576 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSKIA_DLL -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_GPU=1 -DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA -DXML_STATIC -I../.. -Igen -I../../third_party/skia/include/private -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../third_party/zlib -I../../third_party/expat/files/lib -I../../third_party/freetype-android/include -I../../third_party/freetype-android/src/include -I../../third_party/android_tools/ndk/sources/android/cpufeatures -fno-strict-aliasing -march=armv7-a -mfloat-abi=softfp -mtune=generic-armv7-a -mthumb -mthumb-interwork -fno-tree-sra -fno-caller-saves -funwind-tables -fPIC -pipe -ffunction-sections -funwind-tables -fno-short-enums -finline-limit=64 -mfpu=vfpv3-d16 -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++abi/libcxxabi/include -isystem../../third_party/android_tools/ndk/sources/android/support/include -fvisibility=hidden --sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-16/arch-arm -Os -fdata-sections -ffunction-sections -fomit-frame-pointer -g1 -Wno-format -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-extra -Wno-ignored-qualifiers -Wno-type-limits -Wno-unused-local-typedefs -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -Wno-deprecated -Wno-narrowing -Wno-literal-suffix -Wno-error=c++0x-compat -Wno-non-virtual-dtor -Wno-sign-promo -c ../../skia/ext/SkMemory_new_handler.cpp -o obj/skia/ext/libskia.SkMemory_new_handler.o
../../skia/ext/SkMemory_new_handler.cpp:12:52: fatal error: third_party/skia/include/core/SkThread.h: No such file or directory
 #include "third_party/skia/include/core/SkThread.h"

Original issue's description:
> Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.
>
> SkThread.h doesn't do anything anymore execept include those two,
> and thankfully, it doesn't seem to be mentioned outside Skia.
>
> No public API changes.
> TBR=reed@google.com
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c50acf2321d7a934c80d754e9cbe936dfb8eb4cc

TBR=mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1214603003
2015-07-02 06:42:49 -07:00
..
android_deps.gyp WIP: Added support for giflib, updated jpeg and png 2015-03-30 07:52:52 -07:00
android_framework_lib.gyp Make android framework depend on SkCodec. 2015-03-20 11:20:03 -07:00
android_output.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
android_system.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
angle.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
animator.gyp delete (unused) TransparentShader 2015-06-05 11:31:26 -07:00
apptype_console.gypi Remove all code related to NaCl 2015-04-02 12:16:36 -07:00
bench.gyp Experiment with find as a road to Gyp sanity. 2015-05-16 15:47:10 -07:00
bench.gypi Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
canvas_state_lib.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
codec.gyp Add libjpeg-turbo library (depends on yasm) 2015-07-01 14:41:02 -07:00
common_conditions.gypi Default iOS builds to our code signing identity. 2015-04-16 13:29:59 -07:00
common_variables.gypi Enable both static and dynamically linked libpng 2015-04-03 12:35:27 -07:00
common.gypi Remove all code related to NaCl 2015-04-02 12:16:36 -07:00
core.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
core.gypi Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (patchset #4 id:60001 of https://codereview.chromium.org/1215393002/) 2015-07-02 06:42:49 -07:00
debugger.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
dm.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
dm.gypi Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
effects.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
effects.gypi delete (unused) TransparentShader 2015-06-05 11:31:26 -07:00
etc1.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
everything.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
example.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
experimental.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
FileReaderApp.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
find.py Sort build files for consistent link order. 2015-05-20 09:26:47 -07:00
flags.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
freetype.gyp Remove SK_ANDROID_FREETYPE_HAS_MM from build. 2015-06-04 07:38:52 -07:00
freetype.gypi Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
giflib.gyp Creating a new wrapper for gif decoder 2015-04-01 06:58:48 -07:00
gmslides.gypi Gyp: Sanity Part II (GM+Tests) 2015-05-17 06:47:49 -07:00
gpu.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
gpu.gypi Refactor separable varying location info to be stored in GrGLProgram subclass 2015-06-29 23:01:28 -07:00
gputest.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
icu.gyp SkPDF: Add Sfntly to DEPS, gyp 2015-05-18 13:15:56 -07:00
images.gyp Revert "Remove ambiguity of SkJpegUtility name." 2015-06-15 09:10:03 -07:00
iOSShell.gyp Remove old iOS porting files. 2015-06-29 14:12:41 -07:00
jsoncpp.gyp Roll jsoncpp, drop dependency on Chromium overrides. 2014-08-19 07:21:00 -07:00
ktx.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
libjpeg-turbo.gyp Add libjpeg-turbo library (depends on yasm) 2015-07-01 14:41:02 -07:00
libjpeg.gyp
libpng.gyp Enable both static and dynamically linked libpng 2015-04-03 12:35:27 -07:00
libwebp.gyp Build in C++11 mode on Macs. 2015-02-03 13:24:36 -08:00
lua.gyp
most.gyp Visual bench on native android 2015-06-12 12:51:44 -07:00
nanomsg.gyp Experiment with find as a road to Gyp sanity. 2015-05-16 15:47:10 -07:00
opts.gyp Revert of Allow NEON on iOS. (patchset #3 id:40001 of https://codereview.chromium.org/1091823002/) 2015-04-17 14:02:40 -07:00
opts.gypi Replace NEON assembly memset16 and memset32 with intrinsic versions. 2015-04-10 06:24:58 -07:00
pathops_skpclip.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
pathops_unittest.gyp cumulative pathops patch 2015-03-26 07:52:43 -07:00
pathops_unittest.gypi Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall. 2015-04-20 08:31:59 -07:00
pdf.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
pdf.gypi SkPDF: detect YUV-JPEG without relying on ImageGenerator 2015-05-07 11:46:59 -07:00
pdfviewer_lib.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
pdfviewer.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
ports.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
SampleApp.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
sfnt.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
sfntly.gyp SkPDF: Add Sfntly to DEPS, gyp 2015-05-18 13:15:56 -07:00
SimpleCocoaApp.gyp Allows windowed apps to be built on the Mac just by writing a SkOSWindow subclass without needing nib/plist files. 2015-06-18 11:49:42 -07:00
SimpleiOSApp.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
skflate.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
skia_for_android_framework_defines.gypi remove SkData proc guard 2015-06-18 12:11:36 -07:00
skia_for_chromium_defines.gypi remove SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS (now in SkUserConfig.h) 2015-06-20 08:45:59 -07:00
skia_launcher.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
skia_lib.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
svg.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
tests.gypi Rename SkFontConfigParser_android SkFontMgr_android_parser. 2015-06-23 13:25:46 -07:00
tools.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
utils.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
utils.gypi Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
v8.gyp Allows windowed apps to be built on the Mac just by writing a SkOSWindow subclass without needing nib/plist files. 2015-06-18 11:49:42 -07:00
views_animated.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
views.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
visualbench.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
xml.gyp Add copyright headers to remaining gyp files. 2015-03-25 10:22:41 -07:00
xps.gyp Revert "Move headers used by headers in include/ to include/private." 2015-07-01 16:35:59 -04:00
yasm.gyp Add libjpeg-turbo library (depends on yasm) 2015-07-01 14:41:02 -07:00
zlib.gyp Revert of For consistency, use our homebrew zlib everywhere possible. (patchset #6 id:100001 of https://codereview.chromium.org/971673005/) 2015-03-07 07:47:51 -08:00