Android: Add back third_party/ to AOSP

The ANGLE autoroller into AOSP is currently stuck due to a merge
conflict in third_party/glmark2.   Specifically, this directory was
deleted in AOSP, but modified in upstream ANGLE.

The solution is to add back the third_party/ directories into AOSP, and
the ANGLE-owned files.   The full contents will not be added back if
they are a git submodule.

Some third_party/ directories will continue to be deleted due to how
large they are:

  third_party/jdk
  third_party/llvm-build
  third_party/android_build_tools
  third_party/android_sdk

We can look into adding these back in the future if it becomes
necessary.

Additionally, the license information in the Android.bp is being updated
to reflect the newly added files.

Bug: angleproject:6635
Change-Id: I793e5b0797218963a4d06a0399b3be80edd43b37
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3251685
Commit-Queue: Tim Van Patten <timvp@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

scripts/generate_android_bp.py

@@ -550,6 +550,9 @@ def main():
         'license_kinds': [
             'SPDX-license-identifier-Apache-2.0',
             'SPDX-license-identifier-BSD',
+            'SPDX-license-identifier-GPL',
+            'SPDX-license-identifier-GPL-2.0',
+            'SPDX-license-identifier-GPL-3.0',
             'SPDX-license-identifier-LGPL',
             'SPDX-license-identifier-MIT',
             'SPDX-license-identifier-Zlib',
@@ -564,6 +567,12 @@ def main():
             'src/third_party/libXNVCtrl/LICENSE',
             'src/third_party/volk/LICENSE.md',
             'third_party/abseil-cpp/LICENSE',
+            'third_party/android_system_sdk/LICENSE',
+            'third_party/bazel/LICENSE',
+            'third_party/colorama/LICENSE',
+            'third_party/proguard/LICENSE',
+            'third_party/r8/LICENSE',
+            'third_party/turbine/LICENSE',
             'third_party/vulkan-deps/glslang/LICENSE',
             'third_party/vulkan-deps/glslang/src/LICENSE.txt',
             'third_party/vulkan-deps/LICENSE',

scripts/roll_aosp.sh

@@ -138,22 +138,15 @@ generate_Android_bp_file
 
 # Delete all unsupported 3rd party dependencies. Do this after generate_Android_bp_file, so
 # it has access to all of the necessary BUILD.gn files.
-# Any 3rd party dependencies that are added to this list must have their licenses verified.
-find third_party/ -maxdepth 2 -type d ! -path third_party/ \
-    ! -path 'third_party/abseil-cpp*' \
-    ! -path 'third_party/vulkan-deps' \
-    ! -path 'third_party/vulkan-deps/glslang*' \
-    ! -path 'third_party/vulkan-deps/spirv-headers*' \
-    ! -path 'third_party/vulkan-deps/spirv-tools*' \
-    ! -path 'third_party/vulkan-deps/vulkan-headers*' \
-    ! -path 'third_party/vulkan_memory_allocator*' \
-    ! -path 'third_party/zlib*' \
-    -print0 | xargs --null rm -rf
-# Special handling for zlib's contrib/ (third_party) folder, since there are some
-# missing license files.
-find third_party/zlib/contrib/ -maxdepth 1 -type d ! -path third_party/zlib/contrib/ \
-    ! -path 'third_party/zlib/contrib/optimizations*' \
-    -print0 | xargs --null rm -rf
+unsupported_third_party_deps=(
+   "third_party/jdk"
+   "third_party/llvm-build"
+   "third_party/android_build_tools"
+   "third_party/android_sdk"
+)
+for unsupported_third_party_dep in "${unsupported_third_party_deps[@]}"; do
+   rm -rf "$unsupported_third_party_dep"
+done
 
 git add Android.bp