diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/BUCK b/examples/demo-apps/android/LlamaDemo/app/src/main/BUCK
index afbd3697661..a64e11d1306 100644
--- a/examples/demo-apps/android/LlamaDemo/app/src/main/BUCK
+++ b/examples/demo-apps/android/LlamaDemo/app/src/main/BUCK
@@ -1,16 +1,17 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//tools/build_defs/android:fb_android_binary.bzl", "fb_android_binary")
 load("@fbsource//tools/build_defs/android:fb_android_library.bzl", "fb_android_library")
 load("@fbsource//tools/build_defs/android:fb_android_resource.bzl", "fb_android_resource")
 
 oncall("executorch")
 
-fb_android_resource(
+non_fbcode_target(_kind = fb_android_resource,
     name = "app_res",
     package = "com.example.executorchllamademo",
     res = "res",
 )
 
-fb_android_library(
+non_fbcode_target(_kind = fb_android_library,
     name = "app_lib",
     srcs = [
         "java/com/example/executorchllamademo/AppLog.java",
@@ -43,7 +44,7 @@ fb_android_library(
     ],
 )
 
-fb_android_binary(
+non_fbcode_target(_kind = fb_android_binary,
     name = "ExecuTorchLlamaDemo",
     keystore = "//fbandroid/keystores:debug",
     manifest = "AndroidManifest.xml",
diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/TARGETS b/examples/demo-apps/android/LlamaDemo/app/src/main/TARGETS
deleted file mode 100644
index 5c4f482b5ea..00000000000
--- a/examples/demo-apps/android/LlamaDemo/app/src/main/TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd
diff --git a/extension/android/BUCK b/extension/android/BUCK
index 7312545d6eb..7b8acfcfd88 100644
--- a/extension/android/BUCK
+++ b/extension/android/BUCK
@@ -1,8 +1,9 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//tools/build_defs/android:fb_android_library.bzl", "fb_android_library")
 
 oncall("executorch")
 
-fb_android_library(
+non_fbcode_target(_kind = fb_android_library,
     name = "executorch",
     srcs = [
         "executorch_android/src/main/java/org/pytorch/executorch/DType.java",
@@ -20,7 +21,7 @@ fb_android_library(
     ],
 )
 
-fb_android_library(
+non_fbcode_target(_kind = fb_android_library,
     name = "executorch_llama",
     srcs = [
         "executorch_android/src/main/java/org/pytorch/executorch/extension/llm/LlmCallback.java",
diff --git a/extension/android/TARGETS b/extension/android/TARGETS
deleted file mode 100644
index 5c4f482b5ea..00000000000
--- a/extension/android/TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd
diff --git a/extension/android/jni/BUCK b/extension/android/jni/BUCK
index e1bf26fef26..d9ef6d1455e 100644
--- a/extension/android/jni/BUCK
+++ b/extension/android/jni/BUCK
@@ -1,3 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//tools/build_defs/android:fb_android_cxx_library.bzl", "fb_android_cxx_library")
 load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.bzl", "third_party_dep")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
@@ -5,7 +6,7 @@ load("@fbsource//xplat/executorch/codegen:codegen.bzl", "executorch_generated_li
 
 oncall("executorch")
 
-executorch_generated_lib(
+non_fbcode_target(_kind = executorch_generated_lib,
     name = "generated_op_lib_optimized",
     custom_ops_aten_kernel_deps = [
         "//executorch/kernels/portable:operators_aten",
@@ -24,7 +25,7 @@ executorch_generated_lib(
     ],
 )
 
-fb_android_cxx_library(
+non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_jni",
     srcs = ["jni_layer.cpp", "log.cpp"],
     headers = ["jni_layer_constants.h"],
@@ -49,7 +50,7 @@ fb_android_cxx_library(
     ],
 )
 
-fb_android_cxx_library(
+non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_jni_full",
     srcs = ["jni_layer.cpp", "log.cpp"],
     headers = ["jni_layer_constants.h"],
@@ -74,7 +75,7 @@ fb_android_cxx_library(
     ],
 )
 
-fb_android_cxx_library(
+non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_llama_jni",
     srcs = [
         "jni_layer.cpp",
@@ -106,7 +107,7 @@ fb_android_cxx_library(
     ],
 )
 
-runtime.cxx_library(
+non_fbcode_target(_kind = runtime.cxx_library,
     name = "log_provider",
     srcs = ["log.cpp"],
     exported_headers = ["log.h"],
diff --git a/extension/android/jni/TARGETS b/extension/android/jni/TARGETS
deleted file mode 100644
index 5c4f482b5ea..00000000000
--- a/extension/android/jni/TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd
diff --git a/extension/apple/ExecuTorch/TARGETS b/extension/apple/ExecuTorch/TARGETS
deleted file mode 100644
index 5c4f482b5ea..00000000000
--- a/extension/apple/ExecuTorch/TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd
diff --git a/extension/apple/TARGETS b/extension/apple/TARGETS
deleted file mode 100644
index 5c4f482b5ea..00000000000
--- a/extension/apple/TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-# This file needs to exist to avoid build system breakage, see https://fburl.com/workplace/jtdlgdmd