diff --git a/guest/magma/Android.bp b/guest/magma/Android.bp
new file mode 100644
index 0000000..12d8e6a
--- /dev/null
+++ b/guest/magma/Android.bp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["hardware_google_gfxstream_license"],
+}
+
+cc_library_static {
+    name: "libmagma_android",
+    vendor: true,
+    header_libs: [
+        "libmagma_enc_headers",
+        "libmagma_headers",
+        "libgfxstream_guest_iostream",
+    ],
+    shared_libs: [
+        "libdrm",
+        "liblog",
+        "libOpenglCodecCommon",
+    ],
+    static_libs: [
+        "libplatform",
+        "libgfxstream_guest_android",
+        "libGoldfishAddressSpace",
+        "libandroidemu_static",
+    ],
+    srcs: [
+        "magma.cpp",
+        "magma_enc_util.cpp",
+        "magma_enc/magma_enc.cpp",
+        "magma_enc/magma_entry.cpp",
+        "magma_enc/magma_stubs.cpp",
+        "magma_enc/magma_client_context.cpp",
+    ],
+    cflags: [
+        "-Wno-misleading-indentation",
+        "-Wno-unused-function",
+        "-Wno-unused-parameter",
+    ],
+}
diff --git a/guest/magma/magma_enc/Android.bp b/guest/magma/magma_enc/Android.bp
new file mode 100644
index 0000000..fd8ed58
--- /dev/null
+++ b/guest/magma/magma_enc/Android.bp
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["hardware_google_gfxstream_license"],
+}
+
+cc_library_headers {
+    name: "libmagma_enc_headers",
+    vendor: true,
+    export_include_dirs: [
+        ".",
+    ],
+}
diff --git a/third-party/fuchsia/magma/Android.bp b/third-party/fuchsia/magma/Android.bp
new file mode 100644
index 0000000..b748486
--- /dev/null
+++ b/third-party/fuchsia/magma/Android.bp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["hardware_google_gfxstream_license"],
+}
+
+cc_library_headers {
+    name: "libmagma_headers",
+    vendor: true,
+    export_include_dirs: [
+        "include",
+        "include/lib",
+    ],
+}
