Rename ANGLE_defaults to ANGLE_java_defaults.

This target already exists in internal master, avoid the name conflict until there is only one set of build files. BUG=b:142320172 Change-Id: Ida176f39422c1c57cc2936a06e61b7e86bf2cc90 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2101367Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Rename ANGLE_defaults to ANGLE_java_defaults.
6ab0dbdf · Geoff Lang · Commit Bot · 5bb36cc0 · 6ab0dbdf
Commit 6ab0dbdf authored Mar 12, 2020 by Geoff Lang Committed by Commit Bot Mar 12, 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
@@ -433,7 +433,7 @@ def main():
        'java_defaults',
        {
            'name':
-                'ANGLE_defaults',
+                'ANGLE_java_defaults',
            'sdk_version':
                'system_current',
            'min_sdk_version':
@@ -477,7 +477,7 @@ def main():

    blueprint_targets.append(('android_app', {
        'name': 'ANGLE',
-        'defaults': ['ANGLE_defaults'],
+        'defaults': ['ANGLE_java_defaults'],
        'static_libs': ['ANGLE_library'],
        'manifest': 'src/android_system_settings/src/com/android/angle/AndroidManifest.xml',
        'required': ['privapp_whitelist_com.android.angle'],