3 files changed, 13 insertions, 4 deletions
diff --git a/chromium/rlz/BUILD.gn b/chromium/rlz/BUILD.gn
index ce626f30613..cf56eb53277 100644
--- a/chromium/rlz/BUILD.gn
+++ b/chromium/rlz/BUILD.gn
@@ -40,7 +40,6 @@ source_set("rlz_utils") {
 if (!is_android) {
   source_set("rlz_lib") {
     sources = [
-      "chromeos/lib/machine_id_chromeos.cc",
       "chromeos/lib/rlz_value_store_chromeos.cc",
       "chromeos/lib/rlz_value_store_chromeos.h",
       "ios/lib/machine_id_ios.cc",
@@ -86,6 +85,10 @@ if (!is_android) {
       "//url",
     ]
 
+    if (is_chromeos) {
+      deps += [ "//chromeos" ]
+    }
+
     if (is_mac) {
       libs = [
         "Foundation.framework",
@@ -116,6 +119,9 @@ if (!is_android) {
       "//base/test:test_support",
       "//testing/gtest",
     ]
+    if (is_chromeos) {
+      deps += [ "//chromeos" ]
+    }
   }
 
   test("rlz_unittests") {
@@ -144,6 +150,9 @@ if (!is_android) {
       "//testing/gtest",
       "//third_party/zlib",
     ]
+    if (is_chromeos) {
+      deps += [ "//chromeos" ]
+    }
   }
 }
 
diff --git a/chromium/rlz/features/BUILD.gn b/chromium/rlz/buildflags/BUILD.gn
index 58328e7cf33..bcbcafa5df8 100644
--- a/chromium/rlz/features/BUILD.gn
+++ b/chromium/rlz/buildflags/BUILD.gn
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
-import("//rlz/features/features.gni")
+import("//rlz/buildflags/buildflags.gni")
 
-buildflag_header("features") {
-  header = "features.h"
+buildflag_header("buildflags") {
+  header = "buildflags.h"
   flags = [ "ENABLE_RLZ=$enable_rlz" ]
 }
diff --git a/chromium/rlz/features/features.gni b/chromium/rlz/buildflags/buildflags.gni
index d90c6e18335..d90c6e18335 100644
--- a/chromium/rlz/features/features.gni
+++ b/chromium/rlz/buildflags/buildflags.gni