Fix roll_aosp.sh 'gn gen' failure

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 {

scripts/roll_aosp.sh

@@ -71,6 +71,9 @@ function generate_Android_bp_file() {
 
             # Disable _LIBCPP_ABI_UNSTABLE, since it breaks std::string
             "libcxx_abi_unstable = false"
+
+            # rapidJSON is used for ANGLE's frame capture (among other things), which is unnecessary for AOSP builds.
+            "angle_has_rapidjson = false"
         )
 
         if [[ "$1" == "--enableApiTrace" ]]; then
@@ -128,7 +131,7 @@ done
 
 # Sync all of ANGLE's deps so that 'gn gen' works
 python scripts/bootstrap.py
-gclient sync --reset --force --ignore_locks --delete_unversioned_trees --break_repo_locks
+gclient sync --reset --force --delete_unversioned_trees
 
 generate_Android_bp_file