diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:15 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:15 +0000 |
| commit | 33a75f15b58927af41682c2d612c6de52876ca1f (patch) | |
| tree | 43accd4b15226490e3fc9e82a4f11059f7575490 /dl/openmax_dl_armv7.target.linux-arm.mk | |
| parent | bb8ca9c6322459c09b310adf1e3a91927ffeae50 (diff) | |
| download | openmax_dl-33a75f15b58927af41682c2d612c6de52876ca1f.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: Iab59b3864b3beb060f8a0dc42baafd81c5652331
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index ce2eed7..c1278f3 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -251,6 +251,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_openmax_dl_dl_openmax_dl_armv7_gyp |