Android: Enable APK build.

Bug: angleproject:2344 Change-Id: Iaad7199d2bcbb961d64f14eb640d472c52d7abc6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2842564 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Android: Enable APK build.
002e5622 · Jamie Madill · Commit Bot · 598b6bbd · 002e5622 · 002e5622
Commit 002e5622 authored Apr 21, 2021 by Jamie Madill Committed by Commit Bot Apr 21, 2021
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 30 deletions

BUILD.gn BUILD.gn +1 -2

angle_apk.gni android/angle_apk.gni +8 -28

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1315,8 +1315,7 @@ if (is_android && symbol_level != 0) {
  }
 }
-if (build_with_chromium && is_android &&
+if (is_android && current_toolchain == default_toolchain) {
-    current_toolchain == default_toolchain) {
  apk_version_code = "0"
  if (angle_enable_commit_id) {
    apk_version_code =

--- a/android/angle_apk.gni
+++ b/android/angle_apk.gni
@@ -21,7 +21,7 @@ if (enable_java_templates) {
        "${target_gen_dir}/${target_name}/android/AndroidManifest.xml"
    jinja_template(manifest_target_name) {
-      input = "//third_party/angle/android/AndroidManifest.xml.jinja2"
+      input = "${angle_root}/android/AndroidManifest.xml.jinja2"
      output = manifest_path
      variables = [
        "manifest_package=${invoker.package_name}",
@@ -42,6 +42,7 @@ if (enable_java_templates) {
      version_name = invoker.version_name
      min_sdk_version = 26
      target_sdk_version = 28
+      generate_final_jni = false
      deps = [ ":${invoker.package_name}_assets" ]
      if (symbol_level != 0) {
        deps += [ ":compressed_symbols" ]
@@ -72,22 +73,11 @@ if (enable_java_templates) {
                  "root_out_dir")
          secondary_abi_loadable_modules = []
          foreach(_library, angle_libraries) {
-            if (is_component_build) {
+            secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}${shlib_extension}" ]
-              secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
-            } else {
-              secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so" ]
-            }
          }
          if (angle_enable_vulkan_validation_layers) {
            foreach(_layer, vulkan_validation_layers) {
-              if (is_component_build) {
+              secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_layer}${shlib_extension}" ]
-                secondary_abi_loadable_modules += [
-                  "${_secondary_out_dir}/lib.compressed/lib${_layer}.cr.so",
-                ]
-              } else {
-                secondary_abi_loadable_modules +=
-                    [ "${_secondary_out_dir}/lib.compressed/lib${_layer}.so" ]
-              }
            }
          }
        }
@@ -107,23 +97,13 @@ if (enable_java_templates) {
      } else {
        loadable_modules = []
        foreach(_library, angle_libraries) {
-          if (is_component_build) {
+          loadable_modules += [ "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}${shlib_extension}" ]
-            loadable_modules += [ "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
-          } else {
-            loadable_modules += [
-              "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so",
-            ]
-          }
        }
        if (angle_enable_vulkan_validation_layers) {
          foreach(_layer, vulkan_validation_layers) {
-            if (is_component_build) {
+            loadable_modules += [
-              loadable_modules +=
+              "$root_out_dir/lib.compressed/lib${_layer}${shlib_extension}",
-                  [ "$root_out_dir/lib.compressed/lib${_layer}.cr.so" ]
+            ]
-            } else {
-              loadable_modules +=
-                  [ "$root_out_dir/lib.compressed/lib${_layer}.so" ]
-            }
          }
        }
      }