summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 03:24:52 +0000
committershouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 03:24:52 +0000
commitc8a5af7f61c6086dec015799b0e8e1082add630b (patch)
tree9f39bda62dc72ce42e1b2b4b270cbfa21df3d3fd
parent7564e46221e610dc284af7a142aec724bba883e4 (diff)
downloadchromium_src-c8a5af7f61c6086dec015799b0e8e1082add630b.zip
chromium_src-c8a5af7f61c6086dec015799b0e8e1082add630b.tar.gz
chromium_src-c8a5af7f61c6086dec015799b0e8e1082add630b.tar.bz2
Fix the invalid jni header in native_test_launcher on Android.
The rule of generating jni header is changed, need to update the related source file. BUG= TEST=unittests Review URL: https://chromiumcodereview.appspot.com/10809029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147609 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/android/content_video_view.cc2
-rw-r--r--testing/android/native_test_launcher.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 88599b2..402734c 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -14,7 +14,7 @@
#include "content/common/android/surface_texture_peer.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
-#include "jni/content_video_view_jni.h"
+#include "jni/ContentVideoView_jni.h"
#include "webkit/media/android/media_metadata_android.h"
using base::android::AttachCurrentThread;
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index d2a8e24..d807947 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -29,7 +29,7 @@
#include "base/string_tokenizer.h"
#include "base/string_util.h"
#include "gtest/gtest.h"
-#include "testing/android/jni/chrome_native_test_activity_jni.h"
+#include "testing/jni/ChromeNativeTestActivity_jni.h"
// The main function of the program to be wrapped as a test apk.
extern int main(int argc, char** argv);