diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:14 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:14 +0000 |
| commit | 3c4bb17ebfead7ceee056091e8c5f762709b5f64 (patch) | |
| tree | dc6e3b219d13bd26849f1241c9cd80a47789b235 | |
| parent | 00316171cae3112b345018851ba26bc333db78c7 (diff) | |
| download | freetype-3c4bb17ebfead7ceee056091e8c5f762709b5f64.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I5525533957bab4ead01d43adfa13cdf4438950a0
| -rw-r--r-- | ft2.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | ft2.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 3 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | ft2.target.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | ft2.target.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 3 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 3 | ||||
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 604806a..052a6a0 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -269,6 +269,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index 99d292b..dbd9b03 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -245,6 +245,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index d8858db..9bb0eab 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -255,6 +255,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index f444c58..3768c3c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -257,6 +257,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index cd6cc3a..7ecee4c 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -255,6 +255,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 604806a..052a6a0 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -269,6 +269,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index 99d292b..dbd9b03 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -245,6 +245,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index d8858db..9bb0eab 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -255,6 +255,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index f444c58..3768c3c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -257,6 +257,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index cd6cc3a..7ecee4c 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -255,6 +255,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_freetype_ft2_gyp |