Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1070)

Unified Diff: webrtc/api/java/jni/androidmediacodeccommon.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/api/java/jni/androidmediacodeccommon.h
diff --git a/talk/app/webrtc/java/jni/androidmediacodeccommon.h b/webrtc/api/java/jni/androidmediacodeccommon.h
similarity index 94%
rename from talk/app/webrtc/java/jni/androidmediacodeccommon.h
rename to webrtc/api/java/jni/androidmediacodeccommon.h
index 6fa1817c7c0ffe667b8dcfc5c19453d524c89c96..8502a335be27605cba9584d14f31b28e226d34b0 100644
--- a/talk/app/webrtc/java/jni/androidmediacodeccommon.h
+++ b/webrtc/api/java/jni/androidmediacodeccommon.h
@@ -26,13 +26,13 @@
*
*/
-#ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
+#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
+#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
#include <android/log.h>
-#include "talk/app/webrtc/java/jni/classreferenceholder.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/api/java/jni/classreferenceholder.h"
#include "webrtc/base/logging.h"
+#include "webrtc/base/thread.h"
#include "webrtc/system_wrappers/include/tick_util.h"
namespace webrtc_jni {
@@ -106,4 +106,4 @@ static inline bool CheckException(JNIEnv* jni) {
} // namespace webrtc_jni
-#endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
+#endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_

Powered by Google App Engine
This is Rietveld 408576698