Hash :
26e790f7
Author :
Date :
2025-05-21T14:07:40
Update the gn arg to avoid warning message in gn desc json file
After this change
https://chromium-review.googlesource.com/c/chromium/src/+/6547915,
using android32_ndk_api_level and android64_ndk_api_level gn args
will results in a warning message generated at the top of the
gn desc json file:
WARNING Build argument has no effect.
android32_ndk_api_level = 26
^-
Did you mean "android_ndk_api_level"?
This causes the json.load() function in generate_android_bp.py failing
when parsing the json file
json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)
Update roll_aosp.sh to use the android_ndk_apk_level to remove the
warning message.
Also update the gn arg from android32_ndk_apk_level and
android64_ndk_api_level to android_ndk_apk_level in other files.
Bug: b/418837345
Change-Id: I12fa48dcb5638b37a9965d0adb339a2dee018297
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6576736
Commit-Queue: Yuxin Hu <yuxinhu@google.com>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Auto-Submit: Yuxin Hu <yuxinhu@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# This file is used when gn runs in this directory (or a lower directory
# and searching upward ends here). See "gn help dotfile."
# As a result this file will only affect stand-alone ANGLE builds,
# not chromium builds.
import("//build/dotfile_settings.gni")
import("//dotfile_settings.gni")
# Location of the build configuration file.
buildconfig = "//build/config/BUILDCONFIG.gn"
# The python interpreter to use by default. On Windows, this will look
# for python3.exe and python3.bat.
script_executable = "python3"
# These are the targets to check headers for by default. The files in targets
# matching these patterns (see "gn help label_pattern" for format) will have
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
# check_targets = [ "*" ]
# These are the list of GN files that run exec_script. This allowlist exists
# to force additional review for new uses of exec_script, which is strongly
# discouraged except for gypi_to_gn calls.
exec_script_allowlist = angle_dotfile_settings.exec_script_allowlist +
build_dotfile_settings.exec_script_allowlist +
[
"//build/config/sysroot.gni",
"//build/config/win/BUILD.gn",
"//build/config/win/visual_studio_version.gni",
"//build/gn_helpers.py",
"//build_overrides/build.gni",
]
default_args = {
clang_use_chrome_plugins = false
build_angle_deqp_tests = true
use_sysroot = true
# Saves on importing extra dependencies and ANGLE doesn't use JS.
enable_js_protobuf = false
# Needed only for std::atomic_ref<T> for large Ts http://crbug.com/402171653
use_llvm_libatomic = false
# Disable location tags in isolates.
tests_have_location_tags = false
# Use base level API level 29 support for AHardwareBuffer ANGLE tests.
android_ndk_api_level = 29
vma_vulkan_headers_dir = "//third_party/vulkan-headers/src"
}
no_check_targets = [ "third_party/dawn/*" ]