Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Side by Side Diff: scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json

Issue 2174623003: Revert of [Android] Use --use-su w/ asan_device_setup.sh. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files :\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove (path_to_file)\n", 6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files :\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove (path_to_file)\n",
7 "[SLAVE_BUILD]" 7 "[SLAVE_BUILD]"
8 ], 8 ],
9 "name": "cleanup index.lock", 9 "name": "cleanup index.lock",
10 "~followup_annotations": [ 10 "~followup_annotations": [
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", 527 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
528 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" 528 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
529 ] 529 ]
530 }, 530 },
531 { 531 {
532 "cmd": [ 532 "cmd": [
533 "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh", 533 "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh",
534 "--lib", 534 "--lib",
535 "[SLAVE_BUILD]/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/ lib/linux/libclang_rt.asan-arm-android.so", 535 "[SLAVE_BUILD]/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/ lib/linux/libclang_rt.asan-arm-android.so",
536 "--device", 536 "--device",
537 "07a00ca4", 537 "07a00ca4"
538 "--use-su"
539 ], 538 ],
540 "env": { 539 "env": {
541 "ADB": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb ", 540 "ADB": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb ",
542 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 541 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
543 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 542 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
544 }, 543 },
545 "name": "Set up ASAN on device 07a00ca4" 544 "name": "Set up ASAN on device 07a00ca4"
546 }, 545 },
547 { 546 {
548 "cmd": [ 547 "cmd": [
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 723 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
725 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 724 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
726 }, 725 },
727 "name": "stack_tool_for_asan" 726 "name": "stack_tool_for_asan"
728 }, 727 },
729 { 728 {
730 "cmd": [ 729 "cmd": [
731 "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh", 730 "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh",
732 "--revert", 731 "--revert",
733 "--device", 732 "--device",
734 "07a00ca4", 733 "07a00ca4"
735 "--use-su"
736 ], 734 ],
737 "env": { 735 "env": {
738 "ADB": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb ", 736 "ADB": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb ",
739 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 737 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
740 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 738 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
741 }, 739 },
742 "name": "Tear down ASAN on device 07a00ca4" 740 "name": "Tear down ASAN on device 07a00ca4"
743 }, 741 },
744 { 742 {
745 "cmd": [ 743 "cmd": [
(...skipping 13 matching lines...) Expand all
759 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", 757 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
760 "@@@STEP_LOG_END@python.inline@@@" 758 "@@@STEP_LOG_END@python.inline@@@"
761 ] 759 ]
762 }, 760 },
763 { 761 {
764 "name": "$result", 762 "name": "$result",
765 "recipe_result": null, 763 "recipe_result": null,
766 "status_code": 0 764 "status_code": 0
767 } 765 }
768 ] 766 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698