diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:35 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:35 +0000 |
| commit | b0026218f7844a72aa79b919a723b124ae5a8d3b (patch) | |
| tree | 7af6700da1342d4f09b2a676b84983b81a600455 /ft2.target.linux-x86_64.mk | |
| parent | 538564e18d556b0acfd1aa25697071fa0573bb9d (diff) | |
| download | freetype-b0026218f7844a72aa79b919a723b124ae5a8d3b.tar.gz | |
Update makefiles after merge of Chromium at 262754
This commit was generated by merge_from_chromium.py.
Change-Id: Iac7170596bfdd7c552667d0fe1bbab498baabaf9
Diffstat (limited to 'ft2.target.linux-x86_64.mk')
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index e8ec567..ca12b3a 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_freetype_ft2_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 := |