From 352595459dbd8d0ea63ab6241204340d917c9739 Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@webrtc.org>
Date: Thu, 23 Apr 2015 08:58:21 +0200
Subject: [PATCH] Use short include paths for icu headers.

This makes it possible to build with icu located
in another absolute path.

BUG=4242
R=andresp@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/46079004

Cr-Commit-Position: refs/heads/master@{#9063}
---
 DEPS                                                        | 1 +
 talk/app/webrtc/java/jni/jni_helpers.cc                     | 2 ++
 talk/app/webrtc/java/jni/jni_helpers.h                      | 1 -
 talk/app/webrtc/java/jni/peerconnection_jni.cc              | 1 -
 webrtc/examples/android/media_demo/jni/jni_helpers.cc       | 2 +-
 webrtc/modules/video_capture/android/device_info_android.cc | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index 07fd751ff3..e8313c0da2 100644
--- a/DEPS
+++ b/DEPS
@@ -40,6 +40,7 @@ include_rules = [
   '+talk',
   '+testing',
   '+third_party',
+  '+unicode',
   '+webrtc',
 ]
 
diff --git a/talk/app/webrtc/java/jni/jni_helpers.cc b/talk/app/webrtc/java/jni/jni_helpers.cc
index c4e6e67f95..5ce9926bc1 100644
--- a/talk/app/webrtc/java/jni/jni_helpers.cc
+++ b/talk/app/webrtc/java/jni/jni_helpers.cc
@@ -33,6 +33,8 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#include "unicode/unistr.h"
+
 namespace webrtc_jni {
 
 static JavaVM* g_jvm = nullptr;
diff --git a/talk/app/webrtc/java/jni/jni_helpers.h b/talk/app/webrtc/java/jni/jni_helpers.h
index bfbde78ef1..03ac5298c5 100644
--- a/talk/app/webrtc/java/jni/jni_helpers.h
+++ b/talk/app/webrtc/java/jni/jni_helpers.h
@@ -36,7 +36,6 @@
 #include <string>
 
 #include "webrtc/base/checks.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
 
 // Abort the process if |jni| has a Java exception pending.
 // This macros uses the comma operator to execute ExceptionDescribe
diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc
index 721c65466a..4d13c41842 100644
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -70,7 +70,6 @@
 #include "talk/media/webrtc/webrtcvideocapturer.h"
 #include "talk/media/webrtc/webrtcvideodecoderfactory.h"
 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
diff --git a/webrtc/examples/android/media_demo/jni/jni_helpers.cc b/webrtc/examples/android/media_demo/jni/jni_helpers.cc
index 617967894f..b0d1a7425c 100644
--- a/webrtc/examples/android/media_demo/jni/jni_helpers.cc
+++ b/webrtc/examples/android/media_demo/jni/jni_helpers.cc
@@ -12,7 +12,7 @@
 
 #include <limits>
 
-#include "third_party/icu/source/common/unicode/unistr.h"
+#include "unicode/unistr.h"
 
 using icu::UnicodeString;
 
diff --git a/webrtc/modules/video_capture/android/device_info_android.cc b/webrtc/modules/video_capture/android/device_info_android.cc
index 29c510ea54..02075d5e19 100644
--- a/webrtc/modules/video_capture/android/device_info_android.cc
+++ b/webrtc/modules/video_capture/android/device_info_android.cc
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "json/json.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
+#include "unicode/unistr.h"
 #include "webrtc/modules/video_capture/android/video_capture_android.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/ref_count.h"