diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:40:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:40:50 +0000 |
| commit | 666817c7d15606ae004a72a04aee25d45d5da243 (patch) | |
| tree | 226623a55650a0db4a1494d1d84f77ff65a709a5 | |
| parent | ff3826d38268ab90b557f4992c25fdfa73ee1d23 (diff) | |
| parent | c333849418e52f0b07572738f0baecb81f642435 (diff) | |
| download | webrtc-666817c7d15606ae004a72a04aee25d45d5da243.tar.gz | |
Merge "Add 'vendor: true' to headers to fix vndk builds"
am: c333849418
Change-Id: I2a34f700a1735f2ae000b34ae137a96553ac367e
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | webrtc/modules/Android.bp | 1 | ||||
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/Android.bp | 1 | ||||
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/main/Android.bp | 1 | ||||
| -rw-r--r-- | webrtc/system_wrappers/Android.bp | 1 |
5 files changed, 5 insertions, 0 deletions
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"], } |