summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-11-12 16:44:58 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-13 00:45:41 +0000
commitf667d3b3a1b953800bb5325c7b8d62775a1c5aeb (patch)
tree2e5615b25b452bc7ec6aa7e39076f8648ec305df /sync
parentf7e988ff06ac6ca527bc907410e1f6292534de89 (diff)
downloadchromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.zip
chromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.tar.gz
chromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.tar.bz2
[Android] Enable multidex for debug builds of ChromePublic.
This is a non-incremental implementation. It adds @MainDex to classes used by the renderer to keep them in the main dex, as it can't load secondary dexes when using the multidex support library (i.e., on K and below). BUG=272790 TBR=newt@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/1408163009 Cr-Commit-Position: refs/heads/master@{#359453}
Diffstat (limited to 'sync')
-rw-r--r--sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java b/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
index 171fa51..0c26f6f 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
+++ b/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
@@ -6,6 +6,8 @@ package org.chromium.sync.notifier;
import android.util.Base64;
+import org.chromium.base.annotations.MainDex;
+
import java.util.Random;
/**
@@ -15,6 +17,7 @@ import java.util.Random;
* blocking" feature. That's unfortunate, but better than using a hard-coded ID. A hard-coded ID
* could prevent invalidations from being delivered.
*/
+@MainDex
class RandomizedInvalidationClientNameGenerator implements InvalidationClientNameGenerator {
private static final Random RANDOM = new Random();