Fixes to roll ANGLE into AOSP

Rolling ANGLE into AOSP requires the following fixes: 1.) Update scripts/roll_aosp.sh to not delete third_party/abseil-cpp. 2.) Update BUILD.gn to add a dependency on libnativewindow for "angle_common". Test: AOSP Presubmit Bug: angleproject:5230 Change-Id: If97c44ce041e576edc7c0c43700030b4538e8ab5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2495550Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>

Fixes to roll ANGLE into AOSP
e99b8bc0 · Tim Van Patten · Commit Bot · 2f7fc0f3 · e99b8bc0 · e99b8bc0
Commit e99b8bc0 authored Oct 23, 2020 by Tim Van Patten Committed by Commit Bot Oct 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

BUILD.gn BUILD.gn +10 -0

roll_aosp.sh scripts/roll_aosp.sh +2 -0

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -311,6 +311,16 @@ angle_static_library("angle_common") {
  if (angle_has_build && use_fuzzing_engine) {
    all_dependent_configs = [ ":angle_disable_pool_alloc" ]
  }
+
+  if (is_android && (angle_enable_gl || angle_enable_vulkan)) {
+    # In API level 26 ANativeWindow APIs were moved from libandroid.so
+    # into a separate library, libnativewindow.so
+    if (ndk_api_level_at_least_26) {
+      libs = [ "nativewindow" ]
+    } else {
+      libs = [ "android" ]
+    }
+  }
 }

 config("angle_image_util_config") {

--- a/scripts/roll_aosp.sh
+++ b/scripts/roll_aosp.sh
@@ -9,6 +9,7 @@
 GN_OUTPUT_DIRECTORY=out/Android

 deps=(
+    "third_party/abseil-cpp"
    "third_party/spirv-tools/src"
    "third_party/glslang/src"
    "third_party/spirv-headers/src"
@@ -100,6 +101,7 @@ done
 extra_removal_files=(
   # Some third_party deps have OWNERS files which contains users that have not logged into
   # the Android gerrit. Repo cannot upload with these files present.
+   "third_party/abseil-cpp/OWNERS"
   "third_party/jsoncpp/OWNERS"
   "third_party/vulkan_memory_allocator/OWNERS"
   "third_party/zlib/OWNERS"