diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:09:31 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:09:31 +0100 |
| commit | 22d7bcd9c15e042e542ee19375f85c7b95727e23 (patch) | |
| tree | 9543413a7b593a93672d789c9a0f198bfe1dbaf7 | |
| parent | 99b065411ef372e5b466655b83edaf569fed891d (diff) | |
| parent | cd43b73e3549d890367418a66ee7802036bc336a (diff) | |
| download | libvpx-22d7bcd9c15e042e542ee19375f85c7b95727e23.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.26
This commit was generated by merge_to_master.py.
Change-Id: I83a9ea2e679f5db9547d1bbd0bc23b8ca9a47b7a
| -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 c264a6d..c811555 100644 --- a/libvpx_obj_int_extract.host.darwin-arm.mk +++ b/libvpx_obj_int_extract.host.darwin-arm.mk @@ -205,6 +205,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 3f61cdd..c73b523 100644 --- a/libvpx_obj_int_extract.host.darwin-arm64.mk +++ b/libvpx_obj_int_extract.host.darwin-arm64.mk @@ -203,6 +203,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 5b7068a..9fd22fe 100644 --- a/libvpx_obj_int_extract.host.darwin-x86.mk +++ b/libvpx_obj_int_extract.host.darwin-x86.mk @@ -205,6 +205,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 8924682..758589b 100644 --- a/libvpx_obj_int_extract.host.darwin-x86_64.mk +++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk @@ -205,6 +205,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 5721eba..48c4934 100644 --- a/libvpx_obj_int_extract.host.linux-arm.mk +++ b/libvpx_obj_int_extract.host.linux-arm.mk @@ -209,6 +209,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 532542d..07c8d0e 100644 --- a/libvpx_obj_int_extract.host.linux-arm64.mk +++ b/libvpx_obj_int_extract.host.linux-arm64.mk @@ -207,6 +207,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 ec6aba8..73c202b 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -209,6 +209,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 f7a81c3..c4b6d7f 100644 --- a/libvpx_obj_int_extract.host.linux-x86_64.mk +++ b/libvpx_obj_int_extract.host.linux-x86_64.mk @@ -209,6 +209,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 |