Solve misc build errors

Cynthia Jiang · Cynthia Jiang · commit 5c4a719c70e7 · 2021-04-15T17:53:39.000-07:00
diff --git a/firestore/firestore_resources/AndroidManifest.xml b/firestore/firestore_resources/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.FirebaseCppSdkBuild">
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-sdk android:minSdkVersion="3"/>
+</manifest>
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
@@ -36,13 +36,16 @@ android {
 
   sourceSets {
     main {
-      manifest.srcFile '../../android_build_files/AndroidManifest.xml'
+      manifest.srcFile 'AndroidManifest.xml'
       java {
         srcDirs = ['../src_java/com/google/firebase/firestore/internal/cpp']
         exclude 'Dummy.java'
       }
     }
   }
+  lintOptions {
+    abortOnError false
+  }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,16 @@ android {`
`36`	`36`
`37`	`37`	`sourceSets {`
`38`	`38`	`main {`
`39`		`- manifest.srcFile '../../android_build_files/AndroidManifest.xml'`
	`39`	`+ manifest.srcFile 'AndroidManifest.xml'`
`40`	`40`	`java {`
`41`	`41`	`srcDirs = ['../src_java/com/google/firebase/firestore/internal/cpp']`
`42`	`42`	`exclude 'Dummy.java'`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+ lintOptions {`
	`47`	`+ abortOnError false`
	`48`	`+ }`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`dependencies {`