Add use32bitAbi support to Trichrome Library.

Change-Id: I8ee6fc5e097c47b53fa8fd576ff60e97cbeca06c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2429343
Commit-Queue: Ben Mason <benmason@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810530}

chrome/android/BUILD.gn

@@ -129,6 +129,7 @@ if (android_64bit_target_cpu) {
     variables = trichrome_jinja_variables + [
                   "trichrome_version=$trichrome_64_32_version_code",
                   "manifest_package=$trichrome_library_package",
+                  "use32bitAbi=",
                 ]
   }
   jinja_template("trichrome_library_64_android_manifest") {
@@ -137,6 +138,7 @@ if (android_64bit_target_cpu) {
     variables = trichrome_jinja_variables + [
                   "trichrome_version=$trichrome_64_version_code",
                   "manifest_package=$trichrome_library_package",
+                  "use32bitAbi=",
                 ]
   }
   jinja_template("trichrome_library_32_android_manifest") {

chrome/android/expectations/trichrome_library_apk.AndroidManifest.expected

@@ -14,7 +14,8 @@
       android:extractNativeLibs="false"
       android:icon="@drawable/icon_webview"
       android:label="Trichrome Library"
-      android:multiArch="true">
+      android:multiArch="true"
+      android:use32bitAbi="true">
     <static-library android:name="$PACKAGE" android:version="$VERSION_NUMBER"/>
   </application>
 </manifest>

chrome/android/java/AndroidManifest_trichrome_library.xml

@@ -21,7 +21,8 @@ Note: This is a jinja2 template, processed at build time into the final manifest
         android:label="{{ application_label|default('Trichrome Library') }}"
         android:icon="@drawable/icon_webview"
         android:multiArch="true"
-        android:extractNativeLibs="false">
+        android:extractNativeLibs="false"
+        {{use32bitAbi|default('android:use32bitAbi="true"')}}>
 
         <static-library android:name="{{ trichrome_library }}" android:version="{{ trichrome_version }}" />
     </application>