Update roll AOSP scripts to reflect vulkan-deps subdirectory

Performing a roll with this changes produces https://android-review.googlesource.com/c/1548235 Bug: b/147316305 Bug: angleproject:5456 Test: scripts/roll_aosp.sh && m ANGLE Change-Id: I0f5a698e81a1299abde7cfccb4e1467c8dc02aad Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2625168 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Update roll AOSP scripts to reflect vulkan-deps subdirectory
d392af02 · Jason Macnak · Commit Bot · 0056151c · d392af02 · d392af02
Commit d392af02 authored Jan 12, 2021 by Jason Macnak Committed by Commit Bot Jan 14, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

generate_android_bp.py scripts/generate_android_bp.py +5 -3

roll_aosp.sh scripts/roll_aosp.sh +6 -5

No files found.
--- a/scripts/generate_android_bp.py
+++ b/scripts/generate_android_bp.py
@@ -164,7 +164,7 @@ target_blockist = [
 ]
 include_blocklist = [
-    '//out/Android/gen/third_party/glslang/src/include/',
+    '//out/Android/gen/third_party/vulkan-deps/glslang/src/include/',
 ]
@@ -354,8 +354,10 @@ def gn_action_args_to_blueprint_args(blueprint_inputs, blueprint_outputs, args):
    # path. b/150457277
    remap_folders = [
        # Specific special-cases first, since the other will strip the prefixes.
-        ('gen/third_party/glslang/src/include/glslang/build_info.h', 'glslang/build_info.h'),
+        ('gen/third_party/vulkan-deps/glslang/src/include/glslang/build_info.h',
-        ('third_party/glslang/src', 'external/angle/third_party/glslang/src'),
+         'glslang/build_info.h'),
+        ('third_party/vulkan-deps/glslang/src',
+         'external/angle/third_party/vulkan-deps/glslang/src'),
        ('../../', ''),
        ('gen/', ''),
    ]

--- a/scripts/roll_aosp.sh
+++ b/scripts/roll_aosp.sh
@@ -22,19 +22,20 @@ GN_OUTPUT_DIRECTORY=out/Android
 deps=(
    "third_party/abseil-cpp"
-    "third_party/spirv-tools/src"
-    "third_party/glslang/src"
-    "third_party/spirv-headers/src"
-    "third_party/vulkan-headers/src"
    "third_party/jsoncpp"
    "third_party/jsoncpp/source"
+    "third_party/vulkan-deps/glslang/src"
+    "third_party/vulkan-deps/spirv-headers/src"
+    "third_party/vulkan-deps/spirv-tools/src"
+    "third_party/vulkan-deps/vulkan-headers/src"
    "third_party/vulkan_memory_allocator"
    "third_party/zlib"
 )
-# Only add the parts of NDK that are required by ANGLE. The entire dep is too large.
+# Only add the parts of NDK and vulkan-deps that are required by ANGLE. The entire dep is too large.
 delete_only_deps=(
    "third_party/android_ndk"
+    "third_party/vulkan-deps"
 )
 add_only_deps=(