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 | 28ec957dad68c351e1f1f7b54870a676dc97a0bf (patch) | |
| tree | 761444e12b90b88120e67a1f73598aa6b7d92194 | |
| parent | ca33c17784630ddebe877a87c6dcb7969fee53c3 (diff) | |
| download | libyuv-28ec957dad68c351e1f1f7b54870a676dc97a0bf.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I60102e3f1525419fb7748736f07c1c67499d7efb
| -rw-r--r-- | libyuv.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.darwin-mips.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.linux-mips.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.linux-x86.mk | 3 | ||||
| -rw-r--r-- | libyuv.target.linux-x86_64.mk | 3 | ||||
| -rw-r--r-- | libyuv_neon.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | libyuv_neon.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | libyuv_neon.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | libyuv_neon.target.linux-arm64.mk | 3 |
14 files changed, 42 insertions, 0 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk index 16e2377..f65c00a 100644 --- a/libyuv.target.darwin-arm.mk +++ b/libyuv.target.darwin-arm.mk @@ -271,6 +271,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_libyuv_libyuv_gyp diff --git a/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk index 8bb22f9..ee490a1 100644 --- a/libyuv.target.darwin-arm64.mk +++ b/libyuv.target.darwin-arm64.mk @@ -247,6 +247,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_libyuv_libyuv_gyp diff --git a/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk index 4388bc6..7323869 100644 --- a/libyuv.target.darwin-mips.mk +++ b/libyuv.target.darwin-mips.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_libyuv_libyuv_gyp diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk index 83dcc41..23c8064 100644 --- a/libyuv.target.darwin-x86.mk +++ b/libyuv.target.darwin-x86.mk @@ -259,6 +259,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_libyuv_libyuv_gyp diff --git a/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk index 9de7c99..e825e9a 100644 --- a/libyuv.target.darwin-x86_64.mk +++ b/libyuv.target.darwin-x86_64.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_libyuv_libyuv_gyp diff --git a/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk index 16e2377..f65c00a 100644 --- a/libyuv.target.linux-arm.mk +++ b/libyuv.target.linux-arm.mk @@ -271,6 +271,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_libyuv_libyuv_gyp diff --git a/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk index 8bb22f9..ee490a1 100644 --- a/libyuv.target.linux-arm64.mk +++ b/libyuv.target.linux-arm64.mk @@ -247,6 +247,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_libyuv_libyuv_gyp diff --git a/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk index 4388bc6..7323869 100644 --- a/libyuv.target.linux-mips.mk +++ b/libyuv.target.linux-mips.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_libyuv_libyuv_gyp diff --git a/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk index 83dcc41..23c8064 100644 --- a/libyuv.target.linux-x86.mk +++ b/libyuv.target.linux-x86.mk @@ -259,6 +259,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_libyuv_libyuv_gyp diff --git a/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk index 9de7c99..e825e9a 100644 --- a/libyuv.target.linux-x86_64.mk +++ b/libyuv.target.linux-x86_64.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_libyuv_libyuv_gyp diff --git a/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk index c8e09d9..54e0d60 100644 --- a/libyuv_neon.target.darwin-arm.mk +++ b/libyuv_neon.target.darwin-arm.mk @@ -246,6 +246,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_libyuv_libyuv_neon_gyp diff --git a/libyuv_neon.target.darwin-arm64.mk b/libyuv_neon.target.darwin-arm64.mk index 1957e6e..134e603 100644 --- a/libyuv_neon.target.darwin-arm64.mk +++ b/libyuv_neon.target.darwin-arm64.mk @@ -220,6 +220,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_libyuv_libyuv_neon_gyp diff --git a/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk index c8e09d9..54e0d60 100644 --- a/libyuv_neon.target.linux-arm.mk +++ b/libyuv_neon.target.linux-arm.mk @@ -246,6 +246,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_libyuv_libyuv_neon_gyp diff --git a/libyuv_neon.target.linux-arm64.mk b/libyuv_neon.target.linux-arm64.mk index 1957e6e..134e603 100644 --- a/libyuv_neon.target.linux-arm64.mk +++ b/libyuv_neon.target.linux-arm64.mk @@ -220,6 +220,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_libyuv_libyuv_neon_gyp |