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

Side by Side Diff: mojo/android/javatests/init_library.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « mojo/PRESUBMIT.py ('k') | mojo/application_manager/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 7 #include "base/android/jni_registrar.h"
8 #include "base/android/library_loader/library_loader_hooks.h" 8 #include "base/android/library_loader/library_loader_hooks.h"
9 #include "mojo/android/javatests/mojo_test_case.h" 9 #include "mojo/android/javatests/mojo_test_case.h"
10 #include "mojo/android/javatests/validation_test_util.h" 10 #include "mojo/android/javatests/validation_test_util.h"
11 #include "mojo/android/system/core_impl.h" 11 #include "mojo/android/system/core_impl.h"
12 #include "mojo/embedder/embedder.h" 12 #include "mojo/edk/embedder/embedder.h"
13 #include "mojo/embedder/simple_platform_support.h" 13 #include "mojo/edk/embedder/simple_platform_support.h"
14 14
15 namespace { 15 namespace {
16 16
17 base::android::RegistrationMethod kMojoRegisteredMethods[] = { 17 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
18 { "CoreImpl", mojo::android::RegisterCoreImpl }, 18 { "CoreImpl", mojo::android::RegisterCoreImpl },
19 { "MojoTestCase", mojo::android::RegisterMojoTestCase }, 19 { "MojoTestCase", mojo::android::RegisterMojoTestCase },
20 { "ValidationTestUtil", mojo::android::RegisterValidationTestUtil }, 20 { "ValidationTestUtil", mojo::android::RegisterValidationTestUtil },
21 }; 21 };
22 22
23 bool RegisterMojoJni(JNIEnv* env) { 23 bool RegisterMojoJni(JNIEnv* env) {
(...skipping 14 matching lines...) Expand all
38 return -1; 38 return -1;
39 39
40 if (!RegisterMojoJni(env)) 40 if (!RegisterMojoJni(env))
41 return -1; 41 return -1;
42 42
43 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>( 43 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
44 new mojo::embedder::SimplePlatformSupport())); 44 new mojo::embedder::SimplePlatformSupport()));
45 45
46 return JNI_VERSION_1_4; 46 return JNI_VERSION_1_4;
47 } 47 }
OLDNEW
« no previous file with comments | « mojo/PRESUBMIT.py ('k') | mojo/application_manager/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698