Skip to content

A
angle
Commit 7f07caa9 by Corentin Wallez Committed by Commit Bot
Options

Rename the build/ directory.

GYP related files went in gypfiles/, and the gni went in gni/ this changes frees up the build/ directory name for Chromium's build/ directory. BUG=angleproject:1569 Change-Id: I76fe343d569239c2732ba87986fcf7debc21d417 Reviewed-on: https://chromium-review.googlesource.com/403029 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent e76f55fe
Showing with 49 additions and 49 deletions
BUILD.gn
...@@ -7,7 +7,7 @@ import("//build/config/dcheck_always_on.gni") ...@@ -7,7 +7,7 @@ import("//build/config/dcheck_always_on.gni")
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
import("//third_party/angle/build/angle_common.gni") import("//third_party/angle/gni/angle.gni")
import("//ui/ozone/ozone.gni") import("//ui/ozone/ozone.gni")
if (ozone_platform_gbm) { if (ozone_platform_gbm) {
......
DEPS
...@@ -101,7 +101,7 @@ hooks = [ ...@@ -101,7 +101,7 @@ hooks = [
{ {
# A change to a .gyp, .gypi, or to GYP itself should run the generator. # A change to a .gyp, .gypi, or to GYP itself should run the generator.
'pattern': '.', 'pattern': '.',
'action': ['python', 'build/gyp_angle'], 'action': ['python', 'gyp/gyp_angle'],
}, },
] ]
......
doc/DebuggingTips.md
...@@ -17,7 +17,7 @@ If you follow these steps, apitrace will work correctly aside from a few minor b ...@@ -17,7 +17,7 @@ If you follow these steps, apitrace will work correctly aside from a few minor b
For example, to trace a run of `hello_triangle`, assuming you are using the ninja gyp generator and the apitrace executables are in `$PATH`: For example, to trace a run of `hello_triangle`, assuming you are using the ninja gyp generator and the apitrace executables are in `$PATH`:
``` ```
./build/gyp_angle -D angle_link_glx=1 -D angle_gl_library_type=static_library ./gyp/gyp_angle -D angle_link_glx=1 -D angle_gl_library_type=static_library
ninja -C out/Debug ninja -C out/Debug
export TRACE_LIBGL="/usr/lib/libGL.so.1" # may require a different path export TRACE_LIBGL="/usr/lib/libGL.so.1" # may require a different path
apitrace trace -o mytrace ./out/Debug/hello_triangle apitrace trace -o mytrace ./out/Debug/hello_triangle
......
samples/samples.gyp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{ {
'target_name': 'shader_translator', 'target_name': 'shader_translator',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': [ '../src/angle.gyp:translator', ], 'dependencies': [ '../src/angle.gyp:translator', ],
'include_dirs': [ '../include', ], 'include_dirs': [ '../include', ],
'sources': [ 'shader_translator/shader_translator.cpp' ], 'sources': [ 'shader_translator/shader_translator.cpp' ],
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{ {
'target_name': 'sample_util', 'target_name': 'sample_util',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'<(angle_path)/src/angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
'target_name': 'hello_triangle', 'target_name': 'hello_triangle',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ], 'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
}, },
{ {
'target_name': 'mip_map_2d', 'target_name': 'mip_map_2d',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'mip_map_2d/MipMap2D.cpp', ], 'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
}, },
{ {
'target_name': 'multi_texture', 'target_name': 'multi_texture',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multi_texture/MultiTexture.cpp', ], 'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies': 'copies':
[ [
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
'target_name': 'multi_window', 'target_name': 'multi_window',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multi_window/MultiWindow.cpp', ], 'sources': [ 'multi_window/MultiWindow.cpp', ],
}, },
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
'target_name': 'multiple_draw_buffers', 'target_name': 'multiple_draw_buffers',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ], 'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies': 'copies':
[ [
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
'target_name': 'particle_system', 'target_name': 'particle_system',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'particle_system/ParticleSystem.cpp', ], 'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies': 'copies':
[ [
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
'target_name': 'post_sub_buffer', 'target_name': 'post_sub_buffer',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ], 'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ],
}, },
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
'target_name': 'simple_instancing', 'target_name': 'simple_instancing',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ], 'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
}, },
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
'target_name': 'simple_texture_2d', 'target_name': 'simple_texture_2d',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ], 'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
}, },
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
'target_name': 'simple_texture_cubemap', 'target_name': 'simple_texture_cubemap',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ], 'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
}, },
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
'target_name': 'simple_vertex_shader', 'target_name': 'simple_vertex_shader',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ], 'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ],
}, },
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
'target_name': 'stencil_operations', 'target_name': 'stencil_operations',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ], 'sources': [ 'stencil_operations/StencilOperations.cpp', ],
}, },
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
'target_name': 'tex_redef_microbench', 'target_name': 'tex_redef_microbench',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ], 'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
}, },
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
'target_name': 'texture_wrap', 'target_name': 'texture_wrap',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ], 'sources': [ 'texture_wrap/TextureWrap.cpp', ],
}, },
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
'target_name': 'tri_fan_microbench', 'target_name': 'tri_fan_microbench',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ], 'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
}, },
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
'target_name': 'window_test', 'target_name': 'window_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'WindowTest/WindowTest.cpp', ], 'sources': [ 'WindowTest/WindowTest.cpp', ],
}, },
], ],
......
src/angle.gyp
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
{ {
'target_name': 'angle_common', 'target_name': 'angle_common',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': 'sources':
[ [
'<@(libangle_common_sources)', '<@(libangle_common_sources)',
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
{ {
'target_name': 'angle_image_util', 'target_name': 'angle_image_util',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': 'sources':
[ [
'<@(libangle_image_util_sources)', '<@(libangle_image_util_sources)',
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
{ {
'target_name': 'copy_scripts', 'target_name': 'copy_scripts',
'type': 'none', 'type': 'none',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'hard_dependency': 1, 'hard_dependency': 1,
'copies': 'copies':
[ [
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
{ {
'target_name': 'commit_id', 'target_name': 'commit_id',
'type': 'none', 'type': 'none',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': [ 'copy_scripts', ], 'dependencies': [ 'copy_scripts', ],
'hard_dependency': 1, 'hard_dependency': 1,
'actions': 'actions':
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
'target_name': 'commit_id', 'target_name': 'commit_id',
'type': 'none', 'type': 'none',
'hard_dependency': 1, 'hard_dependency': 1,
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'copies': 'copies':
[ [
{ {
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
'target_name': 'copy_compiler_dll', 'target_name': 'copy_compiler_dll',
'type': 'none', 'type': 'none',
'dependencies': [ 'copy_scripts', ], 'dependencies': [ 'copy_scripts', ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'conditions': 'conditions':
[ [
['angle_build_winrt==0', ['angle_build_winrt==0',
......
src/compiler.gypi
...@@ -248,14 +248,14 @@ ...@@ -248,14 +248,14 @@
'target_name': 'preprocessor', 'target_name': 'preprocessor',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'angle_common' ], 'dependencies': [ 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ '<@(angle_preprocessor_sources)', ], 'sources': [ '<@(angle_preprocessor_sources)', ],
}, },
{ {
'target_name': 'translator_lib', 'target_name': 'translator_lib',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'preprocessor', 'angle_common' ], 'dependencies': [ 'preprocessor', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'.', '.',
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
'target_name': 'translator', 'target_name': 'translator',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'translator_lib', 'angle_common' ], 'dependencies': [ 'translator_lib', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'.', '.',
......
src/libEGL.gypi
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
], ],
'includes': 'includes':
[ [
'../build/common_defines.gypi', '../gyp/common_defines.gypi',
], ],
'include_dirs': 'include_dirs':
[ [
......
src/libGLESv2.gypi
...@@ -710,7 +710,7 @@ ...@@ -710,7 +710,7 @@
'angle_common', 'angle_common',
'angle_image_util', 'angle_image_util',
], ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'.', '.',
...@@ -1037,7 +1037,7 @@ ...@@ -1037,7 +1037,7 @@
'target_name': 'libGLESv2', 'target_name': 'libGLESv2',
'type': '<(angle_gl_library_type)', 'type': '<(angle_gl_library_type)',
'dependencies': [ 'libANGLE', 'angle_common' ], 'dependencies': [ 'libANGLE', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'sources': 'sources':
[ [
'<@(libglesv2_sources)', '<@(libglesv2_sources)',
......
src/tests/BUILD.gn
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import("//testing/test.gni") import("//testing/test.gni")
import("//build/config/chromecast_build.gni") import("//build/config/chromecast_build.gni")
import("//third_party/angle/build/angle_common.gni") import("//third_party/angle/gni/angle.gni")
unittests_gypi = exec_script("//build/gypi_to_gn.py", unittests_gypi = exec_script("//build/gypi_to_gn.py",
[ [
......
src/tests/deqp.gypi
...@@ -1250,7 +1250,7 @@ ...@@ -1250,7 +1250,7 @@
{ {
'target_name': 'angle_zlib', 'target_name': 'angle_zlib',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'<(zlib_path)', '<(zlib_path)',
...@@ -1326,7 +1326,7 @@ ...@@ -1326,7 +1326,7 @@
{ {
'target_name': 'angle_libpng', 'target_name': 'angle_libpng',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'angle_zlib' 'angle_zlib'
...@@ -1842,7 +1842,7 @@ ...@@ -1842,7 +1842,7 @@
{ {
'target_name': 'angle_deqp_gtest_gles2_tests', 'target_name': 'angle_deqp_gtest_gles2_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'angle_deqp_gtest_support', 'angle_deqp_gtest_support',
...@@ -1857,7 +1857,7 @@ ...@@ -1857,7 +1857,7 @@
{ {
'target_name': 'angle_deqp_gtest_gles3_tests', 'target_name': 'angle_deqp_gtest_gles3_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'angle_deqp_gtest_support', 'angle_deqp_gtest_support',
...@@ -1872,7 +1872,7 @@ ...@@ -1872,7 +1872,7 @@
{ {
'target_name': 'angle_deqp_gtest_gles31_tests', 'target_name': 'angle_deqp_gtest_gles31_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'angle_deqp_gtest_support', 'angle_deqp_gtest_support',
...@@ -1887,7 +1887,7 @@ ...@@ -1887,7 +1887,7 @@
{ {
'target_name': 'angle_deqp_gtest_egl_tests', 'target_name': 'angle_deqp_gtest_egl_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'angle_deqp_gtest_support', 'angle_deqp_gtest_support',
......
src/tests/tests.gyp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
'includes': 'includes':
[ [
'deqp.gypi', 'deqp.gypi',
'../../build/common_defines.gypi', '../../gyp/common_defines.gypi',
], ],
'variables': 'variables':
{ {
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
{ {
'target_name': 'angle_internal_gtest', 'target_name': 'angle_internal_gtest',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'<(angle_path)/testing/gtest', '<(angle_path)/testing/gtest',
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
{ {
'target_name': 'angle_internal_gmock', 'target_name': 'angle_internal_gmock',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
[ [
'<(angle_path)/testing/gmock', '<(angle_path)/testing/gmock',
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
'type': 'executable', 'type': 'executable',
'includes': 'includes':
[ [
'../../build/common_defines.gypi', '../../gyp/common_defines.gypi',
'angle_unittests.gypi', 'angle_unittests.gypi',
], ],
'sources': 'sources':
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
'type': 'executable', 'type': 'executable',
'includes': 'includes':
[ [
'../../build/common_defines.gypi', '../../gyp/common_defines.gypi',
'angle_end2end_tests.gypi', 'angle_end2end_tests.gypi',
], ],
'sources': 'sources':
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
'type': 'executable', 'type': 'executable',
'includes': 'includes':
[ [
'../../build/common_defines.gypi', '../../gyp/common_defines.gypi',
'angle_perftests.gypi', 'angle_perftests.gypi',
], ],
'sources': 'sources':
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
{ {
'target_name': 'angle_gles2_conformance_tests', 'target_name': 'angle_gles2_conformance_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'<(angle_path)/src/angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
{ {
'target_name': 'angle_gles3_conformance_tests', 'target_name': 'angle_gles3_conformance_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ], 'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'<(angle_path)/src/angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
......
util/util.gyp
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
{ {
'target_name': 'angle_util', 'target_name': 'angle_util',
'type': 'shared_library', 'type': 'shared_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'<(angle_path)/src/angle.gyp:angle_common', '<(angle_path)/src/angle.gyp:angle_common',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment