Revert "[bazel] pass platform in refresh-bazel-compdb"

This reverts commit b5eee20.

Reason for revert: platforms should be informed by the bazel transition

Original change's description:
> [bazel] pass platform in refresh-bazel-compdb
>
> With the newer version of bazel, this tool started failing because the
> c++ toolchain could not be resolved when there was no platform passed
> in. This change includes the platform based on the current target_cpu.
>
> Change-Id: I7fe7bd696bd8bd311a3c9c009f794c0e6402670a
> Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1182315
> Commit-Queue: Auto-Submit <[email protected]>
> Fuchsia-Auto-Submit: Chase Latta <[email protected]>
> Reviewed-by: Jiaming Li <[email protected]>

Change-Id: I2263111b0b03a67798888a828a0ee050f2c7a4b9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1182454
Reviewed-by: RubberStamper 🤖 <[email protected]>
Commit-Queue: Chase Latta <[email protected]>

Author: chaselatta

tools/devshell/contrib/refresh-bazel-compdb

@@ -22,21 +22,13 @@ source "${_script_dir}/../lib/bazel_utils.sh" || exit $?
 
 # We need to figure out our compilation mode to pass to bazel
 fx-build-dir-if-present || return 1
-optimization=$(
-  fx-command-run gn args "${FUCHSIA_BUILD_DIR}" --list=optimize --json |  \
-  # Sometimes fx will print warnings so we pass it through sed to only grab the json between
-  # the [].
-  sed 's/.*\[\([^]]*\)\].*/\1/' | \
-  fx-command-run jq '.[0] | if .current then .current else .default end |  .value'
-)
-
-# TODO: figure out the --platform to build
+optimization=$(fx-command-run gn args ${FUCHSIA_BUILD_DIR} --list=optimize --json | fx-command-run jq ".[0] | if .current then .current else .default end |  .value")
+
 BAZEL_EXE="$(fx-get-bazel)"
 "${_script_dir}/refresh-bazel-compdb-bin.py" \
-  --bazel "$BAZEL_EXE" \
+  --bazel $BAZEL_EXE \
   --optimization "${optimization}" \
   --build-dir "${FUCHSIA_BUILD_DIR}" \
-  --target_cpu "$FUCHSIA_ARCH" \
   "$@"
 
 

tools/devshell/contrib/refresh-bazel-compdb-bin.py

@@ -16,19 +16,6 @@
 
 _SHOULD_LOG = False
 
-_CPU_ALIASES = {
-    "k8": "x86_64",
-    "x86_64": "x86_64",
-    "aarch64": "aarch64",
-    "arm64": "aarch64",
-    "riscv64": "riscv64",
-}
-_FUCHSIA_PLATFORMS_MAP = {
-    "x86_64": "fuchsia_x64",
-    "aarch64": "fuchsia_arm64",
-    "riscv64": "fuchsia_riscv64",
-}
-
 
 class Action:
     """Represents an action that comes from aquery"""
@@ -158,19 +145,8 @@ def collect_actions(action_graph: Sequence[Dict]) -> Sequence[Action]:
     return actions
 
 
-def platform_arg_for_target_cpu(target_cpu) -> str:
-    cpu = _CPU_ALIASES[target_cpu]
-    platform = _FUCHSIA_PLATFORMS_MAP[cpu]
-    return (
-        f"--platforms=@rules_fuchsia//fuchsia/constraints/platforms:{platform}"
-    )
-
-
 def get_action_graph_from_labels(
-    bazel_exe: str,
-    compilation_mode: str,
-    target_cpu: str,
-    labels: Sequence[str],
+    bazel_exe: str, compilation_mode, labels: Sequence[str]
 ) -> Sequence[Dict]:
     labels_set = "set({})".format(" ".join(labels))
     info("Getting action graph for {}".format(labels_set))
@@ -180,7 +156,6 @@ def get_action_graph_from_labels(
             "aquery",
             "mnemonic('CppCompile',deps({}))".format(labels_set),
             compilation_mode,
-            platform_arg_for_target_cpu(target_cpu),
             "--output=jsonproto",
             "--ui_event_filters=-info,-warning",
             "--noshow_loading_progress",
@@ -290,9 +265,6 @@ def main(argv: Sequence[str]):
     parser.add_argument(
         "--optimization", required=True, help="The build level optimization"
     )
-    parser.add_argument(
-        "--target_cpu", required=True, help="The target cpu we are building for"
-    )
     parser.add_argument(
         "-v",
         "--verbose",
@@ -320,7 +292,6 @@ def main(argv: Sequence[str]):
     actions = get_action_graph_from_labels(
         args.bazel,
         compilation_mode(args),
-        args.target_cpu,
         labels,
     )