teeminus
commented
3 weeks ago I had some problems with a missing file (components/optimization_guide/machine_learning_tflite_buildflags.h) and a BUILDFLAG define (BUILDFLAG(BUILD_WITH_TFLITE_LIB); seems to be a windows specific problem) which resulted in the following patch (which includes the core repo patch as well):
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -5,8 +5,6 @@
#include "services/passage_embeddings/passage_embeddings_service.h"
#include "base/files/file.h"
-#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
-#include "services/passage_embeddings/passage_embedder.h"
namespace passage_embeddings {
@@ -21,7 +19,7 @@ void PassageEmbeddingsService::LoadModels(
mojom::PassageEmbeddingsLoadModelsParamsPtr params,
mojo::PendingReceiver<mojom::PassageEmbedder> model,
LoadModelsCallback callback) {
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+#if (0)
embedder_ = std::make_unique<PassageEmbedder>(std::move(model));
// Load the model files.
--- a/services/passage_embeddings/passage_embeddings_service.h
+++ b/services/passage_embeddings/passage_embeddings_service.h
@@ -5,13 +5,11 @@
#ifndef SERVICES_PASSAGE_EMBEDDINGS_PASSAGE_EMBEDDINGS_SERVICE_H_
#define SERVICES_PASSAGE_EMBEDDINGS_PASSAGE_EMBEDDINGS_SERVICE_H_
-#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "services/passage_embeddings/public/mojom/passage_embeddings.mojom.h"
namespace passage_embeddings {
-class PassageEmbedder;
// Class implementation of the passage embeddings service mojo interface.
class PassageEmbeddingsService : public mojom::PassageEmbeddingsService {
@@ -30,7 +28,7 @@ class PassageEmbeddingsService : public mojom::PassageEmbeddingsService {
mojo::Receiver<mojom::PassageEmbeddingsService> receiver_;
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+#if (0)
std::unique_ptr<PassageEmbedder> embedder_;
#endif
};
Now I am stuck with another windows specific problem:
In file included from ../../services/webnn/dml/adapter.cc:5:
In file included from ../..\services/webnn/dml/adapter.h:14:
../..\third_party/microsoft_dxheaders/include/directml.h(9,10): fatal error: 'third_party/microsoft_dxheaders/src/include/directx/DirectML.h' file not found
9 | #include "third_party/microsoft_dxheaders/src/include/directx/DirectML.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The header is included by a few files and I am not sure if I sould patch all of them or if there is an other cause for the problem.
Ahrotahn
PF4Public
clickot
Cubik65536
networkException
alienbob
This PR updates to Chromium 126.0.6478.55.
Notes:
New patches:
The building with prunned binaries patch has new additions for the AI changes in [5518819] and [5431113]
The safebrowsing patch had some turmoil due changing how we deal with the enterprise connectors in response to [5485006]. There may be some platform-specific sections I missed, so let me know if you encounter any build issues.
The remove unused prefs patch had some new changes for [5446906], [5371929], [5494404], and [5377876]
0018-disable-first-run-behaviour.patch has been removed due to [5501043]
A small change for the close confirmation patch due to [5517669]. The reset was removed since it was causing crashes. Even though the original code still does the same thing, this no longer seems to be affected by the bug that fix was for.
The disable capture all screens patch had some changes due to [5428620]
The remove ui patch had an addition for the safety hub transition as well as a removal for the menu help bubble on new profiles
js_code_coverage was added to the contingent paths due to a filename difference between clone and tarball
Debian sysroots are now included in DEPS and they plan to remove the download script eventually. This means that some sysroots will now be included in the tarballs. I've opted to just allow the pruning script to do it's thing, but what this means is that anyone building with a sysroot would need to replace the pruned directory with one from a clean clone or tarball, otherwise you'll encounter missing libraries during build. Hopefully the increased size doesn't require us to raise our CI requirements...
Change log Blog post