diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
| commit | c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c (patch) | |
| tree | e9edd581ad60ab80aa5ab423a2a80df652a75792 /gpu/command_buffer_common.target.darwin-x86.mk | |
| parent | 54cd42278ccf1d52996034848086a09b23065a40 (diff) | |
| download | chromium_org-c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c.tar.gz | |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
Diffstat (limited to 'gpu/command_buffer_common.target.darwin-x86.mk')
| -rw-r--r-- | gpu/command_buffer_common.target.darwin-x86.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gpu/command_buffer_common.target.darwin-x86.mk b/gpu/command_buffer_common.target.darwin-x86.mk index e58dbc7d00..5b92ce2b9c 100644 --- a/gpu/command_buffer_common.target.darwin-x86.mk +++ b/gpu/command_buffer_common.target.darwin-x86.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := gpu_command_buffer_common_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp + $(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp,,,$(GYP_VAR_PREFIX))/khronos_headers.stamp GYP_GENERATED_OUTPUTS := @@ -218,9 +219,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -235,9 +236,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ |