Skip to content

Commit

Permalink
Revert "Add Google Play Services integration"
Browse files Browse the repository at this point in the history
This reverts commit 5348020.
  • Loading branch information
kiwibrowser committed Aug 25, 2021
1 parent 0d9107c commit 880f27c
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions third_party/android_deps/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ apply plugin: ChromiumPlugin

buildscript {
repositories {
google()
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies {
classpath 'org.owasp:dependency-check-gradle:6+'
classpath 'com.google.gms:google-services:4.3.2'
}
}

Expand All @@ -26,7 +24,7 @@ repositories {

dependencyCheck {
// Any known vulnerability of any severity will cause the build to fail.
failBuildOnCVSS = 11
failBuildOnCVSS = 0
suppressionFile = file('vulnerability_supressions.xml')
// Libraries used in these configurations aren't shipped in Chrome.
// They are only used to aid in compiling or testing.
Expand Down Expand Up @@ -77,7 +75,6 @@ dependencies {
compile 'com.google.android.gms:play-services-vision-common:19.1.3'
compile 'com.google.android.gms:play-services-vision:20.1.3'
compile 'com.google.android.gms:play-services-fido:19.0.0-beta'
compile 'com.google.android.gms:play-services-ads:20.2.0'

// TODO (bjoyce): Remove after androidx migration crbug.com/896775
// Support v4 libraries
Expand Down Expand Up @@ -193,14 +190,12 @@ dependencies {
testCompile "org.robolectric:shadows-multidex:${robolectricVersion}"
testCompile "org.robolectric:shadows-playservices:${robolectricVersion}"
testCompile "org.robolectric:utils:${robolectricVersion}"

apply plugin: 'com.google.gms.google-services'
}

task setUpRepository(type: BuildConfigGenerator) {
// Paths are relative to the chromium source root.
repositoryPath 'third_party/android_deps'
chromiumSourceRoot '../..'
cipdBucket 'chromium'
internalTargetVisibility = [ ':*', '//base:base_java', '//chrome/android:*', '//third_party/androidx:*' ]
internalTargetVisibility = [ ':*', '//third_party/androidx:*' ]
}

0 comments on commit 880f27c

Please sign in to comment.