Commit 1f9e7359 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

android-binary-size: Build with android_channel="stable"

Avoids including assets/unwind_cfi in measurements, which is a canary &
dev-only feature.

Bug: 960197
Change-Id: I513f152ef0172804daaa563d5221eb501b2126f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1598230Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657443}
parent 118dc0e7
...@@ -81,6 +81,7 @@ attention or the expected file needs updating. ...@@ -81,6 +81,7 @@ attention or the expected file needs updating.
``` ```
enable_chrome_android_internal = false enable_chrome_android_internal = false
is_java_debug = false is_java_debug = false
android_channel = "stable"
``` ```
* Your local branch is up-to-date with master * Your local branch is up-to-date with master
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS"/> <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.READ_SYNC_STATS"/> <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
...@@ -1117,7 +1116,6 @@ ...@@ -1117,7 +1116,6 @@
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="org.chromium.chrome.browser.dummy.action"/> <action android:name="org.chromium.chrome.browser.dummy.action"/>
...@@ -1204,7 +1202,6 @@ ...@@ -1204,7 +1202,6 @@
<meta-data <meta-data
android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:name="com.samsung.android.sdk.multiwindow.penwindow.enable"
android:value="true"/> android:value="true"/>
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/>
<meta-data <meta-data
android:name="ipc.invalidation.ticl.gcm_upstream_service_class" android:name="ipc.invalidation.ticl.gcm_upstream_service_class"
android:value="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"/> android:value="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"/>
...@@ -1338,10 +1335,6 @@ ...@@ -1338,10 +1335,6 @@
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/> <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
<data android:scheme="package"/> <data android:scheme="package"/>
</intent-filter> </intent-filter>
<intent-filter>
<action
android:name="org.chromium.chrome.browser.browserservices.ClientAppBroadcastReceiver.DEBUG"/>
</intent-filter>
</receiver> </receiver>
<receiver <receiver
android:label="@string/bookmark_widget_title" android:label="@string/bookmark_widget_title"
......
...@@ -898,7 +898,8 @@ ...@@ -898,7 +898,8 @@
], ],
'android_binary_size': [ 'android_binary_size': [
'android', 'android_config_check', 'chrome_with_codecs', 'goma', 'minimal_symbols', 'official_optimize', 'android', 'android_config_check', 'chrome_with_codecs', 'goma',
'minimal_symbols', 'official_optimize', 'stable_channel',
], ],
'android_cast_debug_static_bot': [ 'android_cast_debug_static_bot': [
...@@ -2364,6 +2365,10 @@ ...@@ -2364,6 +2365,10 @@
'gn_args': 'enable_resource_whitelist_generation=true', 'gn_args': 'enable_resource_whitelist_generation=true',
}, },
'stable_channel': {
'gn_args': 'android_channel="stable"',
},
'tsan': { 'tsan': {
'gn_args': 'is_tsan=true', 'gn_args': 'is_tsan=true',
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment