| Index: android/java/src/org/chromium/base/annotations/MainDex.java
|
| diff --git a/android/java/src/org/chromium/base/annotations/AccessedByNative.java b/android/java/src/org/chromium/base/annotations/MainDex.java
|
| similarity index 53%
|
| copy from android/java/src/org/chromium/base/annotations/AccessedByNative.java
|
| copy to android/java/src/org/chromium/base/annotations/MainDex.java
|
| index 6df7c11027ccf6122b0df4d6c6c8964f835b1526..576b2adbbe9ca236d5ca47f5f290ef73b5809f0b 100644
|
| --- a/android/java/src/org/chromium/base/annotations/AccessedByNative.java
|
| +++ b/android/java/src/org/chromium/base/annotations/MainDex.java
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -10,11 +10,11 @@ import java.lang.annotation.RetentionPolicy;
|
| import java.lang.annotation.Target;
|
|
|
| /**
|
| - * @AccessedByNative is used to ensure proguard will keep this field, since it's
|
| - * only accessed by native.
|
| + * An annotation that signals that a class should be kept in the main dex file.
|
| + *
|
| + * This generally means it's used by renderer processes, which can't load secondary dexes
|
| + * on K and below.
|
| */
|
| -@Target(ElementType.FIELD)
|
| +@Target(ElementType.TYPE)
|
| @Retention(RetentionPolicy.CLASS)
|
| -public @interface AccessedByNative {
|
| - public String value() default "";
|
| -}
|
| +public @interface MainDex {}
|
|
|