| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gyp.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gyp.json
|
| similarity index 89%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gyp.json
|
| index a18c8bc465a8d0a766433bba4674411366349e01..2f445f89b95a8e51cf1e2ca6811f6e6dda4b20d6 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gyp.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/Android32_GN",
|
| + "[BUILDER_CACHE]/Android32_GYP",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -29,7 +29,7 @@
|
| "--master",
|
| "client.webrtc",
|
| "--builder",
|
| - "Android32 GN",
|
| + "Android32 GYP",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -46,7 +46,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android32_GN",
|
| + "cwd": "[BUILDER_CACHE]/Android32_GYP",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -83,7 +83,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
|
| - "[BUILDER_CACHE]/Android32_GN/src/out"
|
| + "[BUILDER_CACHE]/Android32_GYP/src/out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -92,10 +92,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[BUILDER_CACHE]/Android32_GN/src/out/Release/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Android32_GN/src/out/Release/test_logs",
|
| - "[BUILDER_CACHE]/Android32_GN/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Android32_GN/src"
|
| + "[BUILDER_CACHE]/Android32_GYP/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/Android32_GYP/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/Android32_GYP/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/Android32_GYP/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -179,13 +179,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android32_GN/src",
|
| + "cwd": "[BUILDER_CACHE]/Android32_GYP/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Android32_GN/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_GN/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "[BUILDER_CACHE]/Android32_GYP/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_GYP/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -193,20 +193,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android32_GN/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/Android32_GYP/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "client.webrtc",
|
| "-b",
|
| - "Android32 GN",
|
| + "Android32 GYP",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Android32_GN/src/webrtc/build/mb_config.pyl",
|
| + "[BUILDER_CACHE]/Android32_GYP/src/webrtc/build/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--gyp-script=[BUILDER_CACHE]/Android32_GN/src/webrtc/build/gyp_webrtc.py",
|
| + "--gyp-script=[BUILDER_CACHE]/Android32_GYP/src/webrtc/build/gyp_webrtc.py",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android32_GN/src",
|
| + "cwd": "[BUILDER_CACHE]/Android32_GYP/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -227,7 +227,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android32_GN/src",
|
| + "[BUILDER_CACHE]/Android32_GYP/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -240,12 +240,11 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android32_GN/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_GN/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Android32_GYP/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_GYP/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
|
|