| Index: scripts/slave/recipes/art.expected/target_hammerhead_device_cleanup_failure.json
|
| diff --git a/scripts/slave/recipes/art.expected/target_hammerhead_device_cleanup_failure.json b/scripts/slave/recipes/art.expected/target_hammerhead_device_cleanup_failure.json
|
| index 4c04a118873dbaa11d9075a3bc61923a40e23ed0..c9eb62353d65679a5176e1e541d89257971afbc3 100644
|
| --- a/scripts/slave/recipes/art.expected/target_hammerhead_device_cleanup_failure.json
|
| +++ b/scripts/slave/recipes/art.expected/target_hammerhead_device_cleanup_failure.json
|
| @@ -1,34 +1,31 @@
|
| [
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "init",
|
| "-u",
|
| "https://android.googlesource.com/platform/manifest",
|
| "-b",
|
| "master-art"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo init"
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo sync"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/buildbot-build.sh",
|
| + "[CWD]/art/tools/buildbot-build.sh",
|
| "-j8",
|
| "--target"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -42,10 +39,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -55,12 +52,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/setup-buildbot-device.sh"
|
| + "[CWD]/art/tools/setup-buildbot-device.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -74,10 +70,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -95,10 +91,9 @@
|
| "/data/art-test",
|
| "/data/nativetest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -112,10 +107,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -132,10 +127,9 @@
|
| "make",
|
| "test-art-target-sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -149,10 +143,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -166,10 +160,9 @@
|
| "-j4",
|
| "test-art-target-gtest32"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -184,10 +177,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -203,10 +196,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -220,10 +212,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -233,12 +225,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -252,10 +243,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -269,10 +260,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -286,10 +276,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -304,10 +294,9 @@
|
| "test-art-target-run-test-optimizing",
|
| "dist"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -323,10 +312,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -342,10 +331,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -359,10 +347,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -372,12 +360,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -391,10 +378,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -408,10 +395,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -425,10 +411,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -443,10 +429,9 @@
|
| "test-art-target-run-test-interpreter",
|
| "dist"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -461,10 +446,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -480,10 +465,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -497,10 +481,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -510,12 +494,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -529,10 +512,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -546,10 +529,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -563,10 +545,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -581,10 +563,9 @@
|
| "test-art-target-run-test-jit",
|
| "dist"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -599,10 +580,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -618,10 +599,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -635,10 +615,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -648,12 +628,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -667,10 +646,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -684,10 +663,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -701,10 +679,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -714,14 +692,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/run-libcore-tests.sh",
|
| + "[CWD]/art/tools/run-libcore-tests.sh",
|
| "--mode=device",
|
| "--variant=X32"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -736,10 +713,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -755,10 +732,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -772,10 +748,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -785,12 +761,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -804,10 +779,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -821,10 +796,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -838,10 +812,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -851,14 +825,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/run-jdwp-tests.sh",
|
| + "[CWD]/art/tools/run-jdwp-tests.sh",
|
| "--mode=device",
|
| "--variant=X32"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -873,10 +846,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -892,10 +865,9 @@
|
| "-v",
|
| "threadtime"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -909,10 +881,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -922,12 +894,11 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
|
| + "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -941,10 +912,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
| @@ -958,10 +929,9 @@
|
| "logcat",
|
| "-c"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/arm_krait",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/arm_krait",
|
| "ANDROID_SERIAL": "03a79ae90ae5889b",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -975,10 +945,10 @@
|
| "ART_TEST_RUN_TEST_NDEBUG": "true",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "arm_krait",
|
|
|