From 48e779f31d7a9c2a3c18757ab2a05b5cd157a92a Mon Sep 17 00:00:00 2001 From: magjed Date: Tue, 10 Jan 2017 03:43:21 -0800 Subject: [PATCH] Final removal of webrtc/api/android External dependencies have been updated to use webrtc/sdk/android instead, and we can remove the remaining files in webrtc/api/android. BUG=webrtc:5882 TBR=tommi Review-Url: https://codereview.webrtc.org/2628553003 Cr-Commit-Position: refs/heads/master@{#15985} --- webrtc/api/android/jni/DEPS | 3 --- webrtc/api/android/jni/androidmediadecoder_jni.h | 11 ----------- webrtc/api/android/jni/androidmediaencoder_jni.h | 11 ----------- webrtc/api/android/jni/androidnetworkmonitor_jni.h | 11 ----------- webrtc/api/android/jni/classreferenceholder.h | 11 ----------- webrtc/api/android/jni/jni_helpers.h | 11 ----------- 6 files changed, 58 deletions(-) delete mode 100644 webrtc/api/android/jni/DEPS delete mode 100644 webrtc/api/android/jni/androidmediadecoder_jni.h delete mode 100644 webrtc/api/android/jni/androidmediaencoder_jni.h delete mode 100644 webrtc/api/android/jni/androidnetworkmonitor_jni.h delete mode 100644 webrtc/api/android/jni/classreferenceholder.h delete mode 100644 webrtc/api/android/jni/jni_helpers.h diff --git a/webrtc/api/android/jni/DEPS b/webrtc/api/android/jni/DEPS deleted file mode 100644 index 0b7026207b..0000000000 --- a/webrtc/api/android/jni/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+webrtc/sdk/android/src/jni", -] diff --git a/webrtc/api/android/jni/androidmediadecoder_jni.h b/webrtc/api/android/jni/androidmediadecoder_jni.h deleted file mode 100644 index cdd843ce9e..0000000000 --- a/webrtc/api/android/jni/androidmediadecoder_jni.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -// TODO(magjed): Update external dependencies and remove this. -#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.h b/webrtc/api/android/jni/androidmediaencoder_jni.h deleted file mode 100644 index 9680ca8c3b..0000000000 --- a/webrtc/api/android/jni/androidmediaencoder_jni.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -// TODO(magjed): Update external dependencies and remove this. -#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" diff --git a/webrtc/api/android/jni/androidnetworkmonitor_jni.h b/webrtc/api/android/jni/androidnetworkmonitor_jni.h deleted file mode 100644 index 0836972a8b..0000000000 --- a/webrtc/api/android/jni/androidnetworkmonitor_jni.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -// TODO(magjed): Update external dependencies and remove this. -#include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h" diff --git a/webrtc/api/android/jni/classreferenceholder.h b/webrtc/api/android/jni/classreferenceholder.h deleted file mode 100644 index e4a5fded92..0000000000 --- a/webrtc/api/android/jni/classreferenceholder.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -// TODO(magjed): Update external dependencies and remove this. -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" diff --git a/webrtc/api/android/jni/jni_helpers.h b/webrtc/api/android/jni/jni_helpers.h deleted file mode 100644 index c6da1934ad..0000000000 --- a/webrtc/api/android/jni/jni_helpers.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -// TODO(magjed): Update external dependencies and remove this. -#include "webrtc/sdk/android/src/jni/jni_helpers.h"