Merge upstream/dev: resolve CMakeLists.txt comment conflict

Author: plawanrath

CMakeLists.txt

@@ -247,8 +247,13 @@ enable_testing()
 find_package(GTest REQUIRED)
 include(GoogleTest)
 
-# Local-only: see PR #917. Needed so tests linking against libgemma's
-# per-target SIMD symbols resolve N_EMU128:: variants too.
+# Tests use HWY_IS_TEST=1 with `hwy/foreach_target.h`, which expands the test
+# TU for every attainable SIMD target (including EMU128). libgemma's
+# foreach_target sources (flash_attention.cc, attention.cc, gemma.cc, vit.cc)
+# normally compile only for the baseline+best targets, so tests would fail to
+# link against per-target symbols like N_EMU128::FlashAttention. Build
+# libgemma for all attainable targets when tests are enabled, matching what
+# the tests reference.
 target_compile_definitions(libgemma PRIVATE HWY_IS_TEST=1)
 
 set(GEMMA_TEST_FILES

ops/fast_ops-inl.h

@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2026 Google LLC
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");