summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-19 21:41:51 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-19 21:41:51 +0000
commit0b134cc4cc2f6f4379cb6ae398022e20b52aabc6 (patch)
tree7913f118e20cfda43eb4509e605e1e25a372d877
parente35f22d73480da0358936525f0e344efe5a54329 (diff)
parent42ddeba4a7ad6382898ef2e57dc4bd9f9da57aca (diff)
downloadlibvpx-0b134cc4cc2f6f4379cb6ae398022e20b52aabc6.tar.gz
Merge third_party/libvpx from https://chromium.googlesource.com/chromium/deps/libvpx.git at 42ddeba4a7ad6382898ef2e57dc4bd9f9da57aca
This commit was generated by merge_from_chromium.py. Change-Id: I2ae719c7efaeff0be88009b953ab7be3223f19be
-rw-r--r--BUILD.gn9
1 files changed, 9 insertions, 0 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 5a347d0..797f473 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -44,6 +44,13 @@ config("libvpx_config") {
cflags = [ "-Wno-unused-function", "-Wno-sign-compare" ]
}
+# This config is applied to targets that depend on libvpx.
+config("libvpx_external_config") {
+ include_dirs = [
+ "//third_party/libvpx/source/libvpx",
+ ]
+}
+
executable("libvpx_obj_int_extract") {
sources = [
"//third_party/libvpx/source/libvpx/build/make/obj_int_extract.c"
@@ -267,4 +274,6 @@ static_library("libvpx") {
if (cpu_arch == "arm") {
deps += [ ":libvpx_assembly_arm" ]
}
+
+ public_configs = [ ":libvpx_external_config" ]
}