Remove third_party/angle/ from generate_android_bp.py

Android builds are failing due to .git/HEAD being listed in the Android.bp, which generate_android_bp.py is supposed to remove. The problem is that the blacklist contains '//third_party/angle/.git/HEAD' rather than '//.git/HEAD', due to generating the GN files from chromium/src/ rather than angle/. This CL cleans this up. Bug: b/160727922 Test: Manual script execution and building in AOSP Change-Id: Ia1682605097791d20b28686f3043ddc08d49ca52 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2310960Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Remove third_party/angle/ from generate_android_bp.py
43b951c8 · Tim Van Patten · Commit Bot · df5ed61d · 43b951c8
Commit 43b951c8 authored Jul 21, 2020 by Tim Van Patten Committed by Commit Bot Jul 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

generate_android_bp.py scripts/generate_android_bp.py +2 -2

No files found.
--- a/scripts/generate_android_bp.py
+++ b/scripts/generate_android_bp.py
@@ -160,7 +160,7 @@ def gn_sources_to_blueprint_sources(sources):

 target_blackist = [
    '//build/config:shared_library_deps',
-    '//third_party/angle/third_party/vulkan-validation-layers/src:vulkan_clean_old_validation_layer_objects',
+    '//third_party/vulkan-validation-layers/src:vulkan_clean_old_validation_layer_objects',
 ]

 include_blacklist = [
@@ -382,7 +382,7 @@ blueprint_gen_types = {


 inputs_blacklist = [
-    '//third_party/angle/.git/HEAD',
+    '//.git/HEAD',
 ]

 outputs_remap = {