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 | 8c6e95ba5f47eaf8139efbc732925f77c6f2b3d1 (patch) | |
| tree | c42c96b5846ca578475dc8f84d9e904836b29258 | |
| parent | 9710f6534095552703f92ebf3d48e8ab3d115611 (diff) | |
| download | libjpeg_turbo-8c6e95ba5f47eaf8139efbc732925f77c6f2b3d1.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I0970a63d13dd08fd38ccdaf8f41ba2fa674c7c19
| -rw-r--r-- | libjpeg.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.darwin-mips.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.linux-mips.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86.mk | 3 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86_64.mk | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk index a773b65..4457385 100644 --- a/libjpeg.target.darwin-arm.mk +++ b/libjpeg.target.darwin-arm.mk @@ -286,6 +286,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk index e4a324d..d2473ee 100644 --- a/libjpeg.target.darwin-arm64.mk +++ b/libjpeg.target.darwin-arm64.mk @@ -262,6 +262,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk index e6a06ab..802a5ee 100644 --- a/libjpeg.target.darwin-mips.mk +++ b/libjpeg.target.darwin-mips.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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk index 5303634..78614c6 100644 --- a/libjpeg.target.darwin-x86.mk +++ b/libjpeg.target.darwin-x86.mk @@ -640,6 +640,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk index 02a4291..d325da8 100644 --- a/libjpeg.target.darwin-x86_64.mk +++ b/libjpeg.target.darwin-x86_64.mk @@ -440,6 +440,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk index a773b65..4457385 100644 --- a/libjpeg.target.linux-arm.mk +++ b/libjpeg.target.linux-arm.mk @@ -286,6 +286,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk index e4a324d..d2473ee 100644 --- a/libjpeg.target.linux-arm64.mk +++ b/libjpeg.target.linux-arm64.mk @@ -262,6 +262,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk index e6a06ab..802a5ee 100644 --- a/libjpeg.target.linux-mips.mk +++ b/libjpeg.target.linux-mips.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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk index 5303634..78614c6 100644 --- a/libjpeg.target.linux-x86.mk +++ b/libjpeg.target.linux-x86.mk @@ -640,6 +640,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_libjpeg_turbo_libjpeg_gyp diff --git a/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk index 02a4291..d325da8 100644 --- a/libjpeg.target.linux-x86_64.mk +++ b/libjpeg.target.linux-x86_64.mk @@ -440,6 +440,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_libjpeg_turbo_libjpeg_gyp |