aboutsummaryrefslogtreecommitdiff
path: root/BUILD.gn
diff options
context:
space:
mode:
authorTim Van Patten <timvp@google.com>2021-06-18 14:25:40 -0600
committerAngle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com>2021-06-21 18:10:19 +0000
commit7753c8378754eba8a0119cca8563c00692b00797 (patch)
tree8afbe45be8709f5f05aec1d9e496093e149725f9 /BUILD.gn
parent1891af05fd2dbad3f4bb516ef0b6b1dba9f24be7 (diff)
downloadangle-7753c8378754eba8a0119cca8563c00692b00797.tar.gz
Fix roll_aosp.sh 'gn gen' failure
The 'gn gen' step in roll_aosp.sh is failing due to trying to access third_party/rapidjson/BUILD.gn, which isn't in AOSP. The rapidJSON library is required to build the ANGLE libraries with frame capture enabled, which isn't necessary for AOSP builds. This CL adds the GN arg 'angle_has_rapidjson' which roll_aosp.sh will set to 'false' to prevent 'gn gen' from attempting to access third_party/rapidjson/BUILD.gn. Bug: b/187342779 Change-Id: I6fcc0e94b6325be7523e35f966b8e4dbc708e3b0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2973338 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn7
1 files changed, 5 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index bc179c1093..3b7a2677f7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -45,6 +45,9 @@ declare_args() {
# Optional feature that forces dirty state whenever we use a new context regardless of thread.
angle_force_context_check_every_call = false
+
+ # Indicate if the rapidJSON library is available to build with in third_party/.
+ angle_has_rapidjson = angle_has_build
}
if (angle_build_all) {
@@ -975,7 +978,7 @@ group("angle_compression") {
[ "$angle_zlib_compression_utils_dir:compression_utils_portable" ]
}
-if (angle_has_build) {
+if (angle_has_rapidjson) {
config("angle_rapidjson_config") {
defines = [ "ANGLE_HAS_RAPIDJSON" ]
}
@@ -998,7 +1001,7 @@ angle_source_set("libANGLE_with_capture") {
public_configs = [ ":angle_frame_capture_enabled" ]
sources = libangle_capture_sources
- if (angle_has_build) {
+ if (angle_has_rapidjson) {
public_deps += [ ":angle_json_serializer" ]
sources += [ "src/libANGLE/capture/frame_capture_utils.cpp" ]
} else {