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

Side by Side Diff: base/android/command_line_android.cc

Issue 77473002: [Android] Fix x86 compilation with multiply defined command_line.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 1 month 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 | « base/android/command_line_android.h ('k') | base/base.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/command_line.h" 5 #include "base/android/command_line_android.h"
6 6
7 #include "base/android/jni_array.h" 7 #include "base/android/jni_array.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "jni/CommandLine_jni.h" 11 #include "jni/CommandLine_jni.h"
12 12
13 using base::android::ConvertUTF8ToJavaString; 13 using base::android::ConvertUTF8ToJavaString;
14 using base::android::ConvertJavaStringToUTF8; 14 using base::android::ConvertJavaStringToUTF8;
15 15
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 CommandLine::Init(0, NULL); 76 CommandLine::Init(0, NULL);
77 AppendJavaStringArrayToCommandLine(env, array, true); 77 AppendJavaStringArrayToCommandLine(env, array, true);
78 } 78 }
79 79
80 bool RegisterCommandLine(JNIEnv* env) { 80 bool RegisterCommandLine(JNIEnv* env) {
81 return RegisterNativesImpl(env); 81 return RegisterNativesImpl(env);
82 } 82 }
83 83
84 } // namespace android 84 } // namespace android
85 } // namespace base 85 } // namespace base
OLDNEW
« no previous file with comments | « base/android/command_line_android.h ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698