Chromium: Clean code and fix build error

Signed-off-by: Xingwang Liao <kuoruan@gmail.com>

Author: kuoruan

.gitignore

@@ -1,10 +1,10 @@
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
-!assets/*.dex
 
 # Java class files
 *.class
@@ -16,7 +16,7 @@ out/
 
 # Gradle files
 .gradle/
-/build
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -33,26 +33,50 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
+# IntelliJ
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
+.idea/caches
+# Android Studio 3 in .gitignore file.
+.idea/caches/build_file_checksums.ser
+.idea/modules.xml
 
 # Keystore files
-*.jks
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
 # Google Services (e.g. APIs or Firebase)
-google-services.json
+# google-services.json
 
 # Freeline
 freeline.py
 freeline/
 freeline_project_description.json
 
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
 .DS_Store

.idea/caches/build_file_checksums.ser

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'idea'
+apply from: "$rootDir/gradle/android-lint.gradle"
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -37,12 +38,9 @@ android {
     }
     sourceSets {
         main {
-            java.filter.exclude()
-
             res {
-                srcDirs = [
-                        "src/main/res",
-                        "${rootProject.projectDir}/res_base",
+                srcDirs += [
+                        "$rootDir/base_res",
                 ]
                 excludes = [
                         "**/download_*.xml",
@@ -96,7 +94,6 @@ dependencies {
     implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     implementation 'com.google.dagger:dagger:2.19'
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation project(':autofill_assistant')
     implementation project(':components:autofill')
     implementation project(':components:embedder_support')
     implementation project(':content')
@@ -107,6 +104,7 @@ dependencies {
     implementation project(':customtabs')
     implementation project(':splash')
     implementation project(':feed')
+    implementation project(':autofill_assistant')
     androidTestImplementation "com.android.support.test:runner:$rootProject.ext.runnerVersion"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"

.idea/caches/gradle_models.ser

@@ -47,7 +47,7 @@
  */
 class AssistantDetailsViewBinder
         implements PropertyModelChangeProcessor.ViewBinder<AssistantDetailsModel,
-                AssistantDetailsViewBinder.ViewHolder, PropertyKey> {
+        AssistantDetailsViewBinder.ViewHolder, PropertyKey> {
     private static final int IMAGE_BORDER_RADIUS = 4;
     private static final int PULSING_DURATION_MS = 1_000;
     private static final String DETAILS_TIME_FORMAT = "H:mma";

.idea/modules.xml

@@ -1,53 +1,48 @@
 apply plugin: 'com.android.library'
+apply from: "$rootDir/gradle/android-lint.gradle"
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
     sourceSets {
         main {
             res {
-                srcDirs = [
-                        "src/main/res",
-                        "${rootProject.projectDir}/res_base",
-                ]
-                excludes = [
+                srcDirs += [
+                        "$rootDir/base_res",
                 ]
             }
         }
     }
+}
 
-    lintOptions {
-        abortOnError false
-        ignoreWarnings true
-        disable 'MissingTranslation'
-    }
+afterEvaluate {
+    project ->
+        project.tasks.verifyReleaseResources {
+            onlyIf {
+                println 'Skipping...'
+                return false
+            }
+        }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
     implementation project(':components:components_base')
     implementation project(':ui')
-    androidTestImplementation "com.android.support.test:runner:$rootProject.ext.runnerVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
 }