Index: build/android/pylib/constants/__init__.py |
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py |
index cb5f8995e8f2794b50d4c7bf08379a60672c390a..6efbfff3b33f724097a78a1b5aae7142e9ed0d41 100644 |
--- a/build/android/pylib/constants/__init__.py |
+++ b/build/android/pylib/constants/__init__.py |
@@ -70,6 +70,12 @@ PACKAGE_INFO = { |
'/data/local/chrome-command-line', |
'chrome_devtools_remote', |
None), |
+ 'chromium': PackageInfo( |
+ 'org.chromium.chrome', |
+ 'com.google.android.apps.chrome.Main', |
+ '/data/local/chrome-command-line', |
+ 'chrome_devtools_remote', |
+ None), |
'legacy_browser': PackageInfo( |
'com.google.android.browser', |
'com.android.browser.BrowserActivity', |
@@ -102,7 +108,7 @@ PACKAGE_INFO = { |
'org.chromium.android_webview.test'), |
'gtest': PackageInfo( |
'org.chromium.native_test', |
- 'org.chromium.native_test.NativeTestActivity', |
+ 'org.chromium.native_test.NativeUnitTestActivity', |
'/data/local/tmp/chrome-native-tests-command-line', |
None, |
None), |
@@ -110,13 +116,13 @@ PACKAGE_INFO = { |
'org.chromium.components_browsertests_apk', |
('org.chromium.components_browsertests_apk' + |
'.ComponentsBrowserTestsActivity'), |
- '/data/local/tmp/components-browser-tests-command-line', |
+ '/data/local/tmp/chrome-native-tests-command-line', |
None, |
None), |
'content_browsertests': PackageInfo( |
'org.chromium.content_browsertests_apk', |
'org.chromium.content_browsertests_apk.ContentBrowserTestsActivity', |
- '/data/local/tmp/content-browser-tests-command-line', |
+ '/data/local/tmp/chrome-native-tests-command-line', |
None, |
None), |
'chromedriver_webview_shell': PackageInfo( |
@@ -178,7 +184,7 @@ class ANDROID_SDK_VERSION_CODES(object): |
LOLLIPOP_MR1 = 22 |
ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1 |
-ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.0' |
+ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.1' |
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, |
'third_party/android_tools/sdk') |
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, |