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}
This commit is contained in:
parent
915590e41f
commit
352595459d
1
DEPS
1
DEPS
@ -40,6 +40,7 @@ include_rules = [
|
||||
'+talk',
|
||||
'+testing',
|
||||
'+third_party',
|
||||
'+unicode',
|
||||
'+webrtc',
|
||||
]
|
||||
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "unicode/unistr.h"
|
||||
|
||||
namespace webrtc_jni {
|
||||
|
||||
static JavaVM* g_jvm = nullptr;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
#include <limits>
|
||||
|
||||
#include "third_party/icu/source/common/unicode/unistr.h"
|
||||
#include "unicode/unistr.h"
|
||||
|
||||
using icu::UnicodeString;
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user