Commit 9dbbb996 authored by Yuke Liao's avatar Yuke Liao Committed by Commit Bot

Fix device_policy_remover_generate path

These proto files are generated per toolchain, so this change makes the
action work correctly when compiled inside a non-default toolchain.

Bug: 1129223
Change-Id: I3d040de0f264f92b63e3aa44c63d9f43578ddb66
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419696Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808624}
parent b4a5c3dc
...@@ -3820,13 +3820,12 @@ device_policy_remover_path = "$target_gen_dir/device_policy_remover.cc" ...@@ -3820,13 +3820,12 @@ device_policy_remover_path = "$target_gen_dir/device_policy_remover.cc"
action("device_policy_remover_generate") { action("device_policy_remover_generate") {
script = "policy/tools/generate_device_policy_remover.py" script = "policy/tools/generate_device_policy_remover.py"
descriptor_pool_path = "//third_party/protobuf/python" descriptor_pool_path = "//third_party/protobuf/python"
symbol_database_path = "$root_build_dir/pyproto" symbol_database_path = "$root_out_dir/pyproto"
# This is provided by //components/policy/proto listed in public_deps. # This is provided by //components/policy/proto listed in public_deps.
# The containing directory is in a separate variable because that's what # The containing directory is in a separate variable because that's what
# the script expects as an argument. # the script expects as an argument.
chrome_device_policy_pb2_dir = chrome_device_policy_pb2_dir = "$root_out_dir/pyproto/components/policy/proto"
"$root_build_dir/pyproto/components/policy/proto"
chrome_device_policy_pb2_path = chrome_device_policy_pb2_path =
"$chrome_device_policy_pb2_dir/chrome_device_policy_pb2.py" "$chrome_device_policy_pb2_dir/chrome_device_policy_pb2.py"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment