Google Git
Sign in
android / platform / external / chromium_org / third_party / skia / gyp / d8c21a503a174334dab5618ccccda9e9b288813c
commitd8c21a503a174334dab5618ccccda9e9b288813c[log] [tgz]
authorAndroid Chromium Automerger <chromium-automerger@android>Fri May 02 17:30:38 2014 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>Fri May 02 17:30:38 2014 +0000
tree74573be769c9a6372beda5ce6f15e0b31a424201
parent6e07e1e3067db119e10557e50c1c5063a61ab1a7 [diff]
parentca4311e9500734c101a5d63666fe1a0fbca2c630 [diff]
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at ca4311e9500734c101a5d63666fe1a0fbca2c630

This commit was generated by merge_from_chromium.py.

Change-Id: I9978d4ac74c94c34366cd89476a59756b5c6a567
tree: 74573be769c9a6372beda5ce6f15e0b31a424201
  1. android_deps.gyp
  2. android_framework_lib.gyp
  3. android_system.gyp
  4. angle.gyp
  5. animator.gyp
  6. apptype_console.gypi
  7. bench.gyp
  8. bench.gypi
  9. chromeos_deps.gyp
  10. common.gypi
  11. common_conditions.gypi
  12. common_variables.gypi
  13. core.gyp
  14. core.gypi
  15. debugger.gyp
  16. dm.gyp
  17. effects.gyp
  18. effects.gypi
  19. everything.gyp
  20. experimental.gyp
  21. FileReaderApp.gyp
  22. flags.gyp
  23. fontconfig.gyp
  24. freetype.gyp
  25. freetype.gypi
  26. giflib.gyp
  27. gm.gyp
  28. gmslides.gypi
  29. gpu.gyp
  30. gpu.gypi
  31. gputest.gyp
  32. iconv.gyp
  33. images.gyp
  34. jsoncpp.gyp
  35. libjpeg.gyp
  36. libpng.gyp
  37. libwebp.gyp
  38. lua.gyp
  39. most.gyp
  40. nacl.gyp
  41. opts.gyp
  42. pathops.gypi
  43. pathops_unittest.gyp
  44. pathops_unittest.gypi
  45. pdf.gyp
  46. pdf.gypi
  47. pdfviewer.gyp
  48. pdfviewer_lib.gyp
  49. pixman_test.gyp
  50. poppler.gyp
  51. ports.gyp
  52. public_headers.gypi
  53. record.gyp
  54. record.gypi
  55. SampleApp.gyp
  56. sfnt.gyp
  57. shapeops_demo.gyp
  58. shapeops_edge.gyp
  59. shapeops_tool.gyp
  60. SimpleCocoaApp.gyp
  61. SimpleiOSApp.gyp
  62. skflate.gyp
  63. skia_for_chromium_defines.gypi
  64. skia_lib.gyp
  65. skpskgr_test.gyp
  66. svg.gyp
  67. tests.gyp
  68. tests.gypi
  69. tools.gyp
  70. utils.gyp
  71. v8.gyp
  72. views.gyp
  73. views_animated.gyp
  74. webtry.gyp
  75. xml.gyp
  76. xps.gyp
  77. zlib.gyp