diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /mojo/mojo_none.target.darwin-x86.mk | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'mojo/mojo_none.target.darwin-x86.mk')
| -rw-r--r-- | mojo/mojo_none.target.darwin-x86.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mojo/mojo_none.target.darwin-x86.mk b/mojo/mojo_none.target.darwin-x86.mk index fa022018a7..e746fd4501 100644 --- a/mojo/mojo_none.target.darwin-x86.mk +++ b/mojo/mojo_none.target.darwin-x86.mk @@ -6,7 +6,6 @@ LOCAL_MODULE_CLASS := GYP LOCAL_MODULE := mojo_mojo_none_gyp LOCAL_MODULE_STEM := mojo_none LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional 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)) |