From 647707fec6505d0fe1d6da399081ef7a616b00f5 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 26 Oct 2017 00:33:06 -0700
Subject: Add 'vendor: true' to headers to fix vndk builds

Test: lunch aosp_arm64_ab-eng; mmma external/webrtc
Change-Id: I39c4bde6811bcb7bd1970338c8429bc9564b0ea0
---
 Android.bp                                              | 1 +
 webrtc/modules/Android.bp                               | 1 +
 webrtc/modules/audio_coding/codecs/isac/fix/Android.bp  | 1 +
 webrtc/modules/audio_coding/codecs/isac/main/Android.bp | 1 +
 webrtc/system_wrappers/Android.bp                       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/Android.bp b/Android.bp
index 39ea862d90..b519445c89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -146,6 +146,7 @@ cc_library_shared {
 
 cc_library_headers {
     name: "libwebrtc_headers",
+    vendor: true,
     export_include_dirs: ["."],
 }
 
diff --git a/webrtc/modules/Android.bp b/webrtc/modules/Android.bp
index a3366163f4..461bdfe8a4 100644
--- a/webrtc/modules/Android.bp
+++ b/webrtc/modules/Android.bp
@@ -6,5 +6,6 @@ subdirs = [
 
 cc_library_headers {
     name: "libwebrtc_modules_headers",
+    vendor: true,
     export_include_dirs: ["include"],
 }
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp
index 374d1b13cf..dedbc66395 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp
@@ -2,5 +2,6 @@ subdirs = ["*"]
 
 cc_library_headers {
     name: "libwebrtc_isacfix_headers",
+    vendor: true,
     export_include_dirs: ["include"],
 }
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp
index 19801687a5..54431dbbe3 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/Android.bp
+++ b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp
@@ -2,5 +2,6 @@ subdirs = ["source"]
 
 cc_library_headers {
     name: "libwebrtc_isac_interface",
+    vendor: true,
     export_include_dirs: ["include"],
 }
diff --git a/webrtc/system_wrappers/Android.bp b/webrtc/system_wrappers/Android.bp
index 440152bfcb..a0d85c4f8f 100644
--- a/webrtc/system_wrappers/Android.bp
+++ b/webrtc/system_wrappers/Android.bp
@@ -2,5 +2,6 @@ subdirs = ["source"]
 
 cc_library_headers {
     name: "libwebrtc_system_wrappers_headers",
+    vendor: true,
     export_include_dirs: ["include"],
 }
-- 
cgit v1.2.3