diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-09 19:21:24 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-09 19:21:24 +0000 |
| commit | 4a54b0a411ee790092fa4d18b5f5f8a5e2f9eb2c (patch) | |
| tree | e4d222d2adce533c528ed6bcd88caf171eeee1f1 | |
| parent | 3e31bf3c45968e70b75cb9e0fc433fa2a9887d16 (diff) | |
| download | libvpx-4a54b0a411ee790092fa4d18b5f5f8a5e2f9eb2c.tar.gz | |
Update makefiles after merge of Chromium at 89cfb59e11ed
This commit was generated by merge_from_chromium.py.
Change-Id: I40b74b0d43dfa20fb9a98c7db300bcb6007b49ee
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-arm.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 3 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86_64.mk | 3 |
8 files changed, 24 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.darwin-arm.mk b/libvpx_obj_int_extract.host.darwin-arm.mk index 97e4db7..37c2ef5 100644 --- a/libvpx_obj_int_extract.host.darwin-arm.mk +++ b/libvpx_obj_int_extract.host.darwin-arm.mk @@ -193,6 +193,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.darwin-arm64.mk b/libvpx_obj_int_extract.host.darwin-arm64.mk index 7dc624f..e9a6169 100644 --- a/libvpx_obj_int_extract.host.darwin-arm64.mk +++ b/libvpx_obj_int_extract.host.darwin-arm64.mk @@ -191,6 +191,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.darwin-x86.mk b/libvpx_obj_int_extract.host.darwin-x86.mk index 9f5fece..a55cfa1 100644 --- a/libvpx_obj_int_extract.host.darwin-x86.mk +++ b/libvpx_obj_int_extract.host.darwin-x86.mk @@ -193,6 +193,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.darwin-x86_64.mk b/libvpx_obj_int_extract.host.darwin-x86_64.mk index edd2838..30b1fa0 100644 --- a/libvpx_obj_int_extract.host.darwin-x86_64.mk +++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk @@ -193,6 +193,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.linux-arm.mk b/libvpx_obj_int_extract.host.linux-arm.mk index a412d39..5403363 100644 --- a/libvpx_obj_int_extract.host.linux-arm.mk +++ b/libvpx_obj_int_extract.host.linux-arm.mk @@ -197,6 +197,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.linux-arm64.mk b/libvpx_obj_int_extract.host.linux-arm64.mk index cd35438..9365c36 100644 --- a/libvpx_obj_int_extract.host.linux-arm64.mk +++ b/libvpx_obj_int_extract.host.linux-arm64.mk @@ -195,6 +195,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index 0d1b38d..5378961 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -197,6 +197,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp diff --git a/libvpx_obj_int_extract.host.linux-x86_64.mk b/libvpx_obj_int_extract.host.linux-x86_64.mk index cb621f7..bb9728a 100644 --- a/libvpx_obj_int_extract.host.linux-x86_64.mk +++ b/libvpx_obj_int_extract.host.linux-x86_64.mk @@ -197,6 +197,9 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) +### Set directly by aosp_build_settings. +LOCAL_CLANG := true + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp |