From 32f5a1c56531e4210bc4cf8d8c7825d66e081888 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 18 Nov 2020 16:35:47 +0100 Subject: BASELINE: Update Chromium to 87.0.4280.67 Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54 Reviewed-by: Allan Sandfeld Jensen --- .../android/java/VersionConstants.java.version | 21 --------------------- .../version_info/VersionConstantsBridge.java | 19 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 chromium/components/version_info/android/java/VersionConstants.java.version delete mode 100644 chromium/components/version_info/android/java/src/org/chromium/components/version_info/VersionConstantsBridge.java (limited to 'chromium/components/version_info') diff --git a/chromium/components/version_info/android/java/VersionConstants.java.version b/chromium/components/version_info/android/java/VersionConstants.java.version deleted file mode 100644 index 08a9ba20861..00000000000 --- a/chromium/components/version_info/android/java/VersionConstants.java.version +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2018 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. - -package org.chromium.components.version_info; - -import org.chromium.base.annotations.MainDex; - -// Constants shared by Android Chrome and WebView. Chrome specific constants are -// in ChromeVersionConstants. -@MainDex -public class VersionConstants { - public static final String PRODUCT_VERSION = "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"; - @SuppressWarnings({"ComplexBooleanConstant", "IdentityBinaryExpression"}) - public static final boolean IS_OFFICIAL_BUILD = @OFFICIAL_BUILD@ == 1; - - public static final int PRODUCT_MAJOR_VERSION = @MAJOR@; - public static final int PRODUCT_BUILD_VERSION = @BUILD@; - - public static final int CHANNEL = Channel.@CHANNEL@; -} diff --git a/chromium/components/version_info/android/java/src/org/chromium/components/version_info/VersionConstantsBridge.java b/chromium/components/version_info/android/java/src/org/chromium/components/version_info/VersionConstantsBridge.java deleted file mode 100644 index 4c124a11e94..00000000000 --- a/chromium/components/version_info/android/java/src/org/chromium/components/version_info/VersionConstantsBridge.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2018 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. - -package org.chromium.components.version_info; - -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.MainDex; - -/** - * Bridge between native and VersionConstants.java. - */ -@MainDex -public class VersionConstantsBridge { - @CalledByNative - public static int getChannel() { - return VersionConstants.CHANNEL; - } -} -- cgit v1.2.1