diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /gpu/gpu_config.target.darwin-x86.mk | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'gpu/gpu_config.target.darwin-x86.mk')
| -rw-r--r-- | gpu/gpu_config.target.darwin-x86.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpu/gpu_config.target.darwin-x86.mk b/gpu/gpu_config.target.darwin-x86.mk index eff8fda76a..bed662324a 100644 --- a/gpu/gpu_config.target.darwin-x86.mk +++ b/gpu/gpu_config.target.darwin-x86.mk @@ -32,8 +32,6 @@ LOCAL_SRC_FILES := \ gpu/config/gpu_info.cc \ gpu/config/gpu_info_collector_android.cc \ gpu/config/gpu_info_collector.cc \ - gpu/config/gpu_switching_list_json.cc \ - gpu/config/gpu_switching_list.cc \ gpu/config/gpu_test_config.cc \ gpu/config/gpu_test_expectations_parser.cc \ gpu/config/gpu_util.cc \ @@ -90,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_MANAGED_USERS=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -111,6 +110,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/re2 \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ @@ -182,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_MANAGED_USERS=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -204,6 +205,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/re2 \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ |