diff --git a/29/system-server/api/android.txt b/29/system-server/api/android.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/29/system-server/api/android.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/29/system-server/api/incompatibilities.txt b/29/system-server/api/incompatibilities.txt
new file mode 100644
index 0000000..9a97707
--- /dev/null
+++ b/29/system-server/api/incompatibilities.txt
@@ -0,0 +1 @@
+// Baseline format: 1.0
diff --git a/Android.bp b/Android.bp
index 1c5b4cf..6d88923 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,6 +68,17 @@
 }
 
 genrule {
+    name: "last-released-system-server-api",
+    srcs: [
+        "*/system-server/api/android.txt",
+    ],
+    cmd: "cp -f $$(echo $(in) | tr \" \" \"\\n\" | sort -t/ -k3 -n | tail -1) $(genDir)/last-released-api.txt",
+    out: [
+        "last-released-api.txt",
+    ],
+}
+
+genrule {
     name: "public-api-incompatibilities-with-last-released",
     srcs: [
         "*/public/api/incompatibilities.txt",
@@ -101,6 +112,17 @@
 }
 
 genrule {
+    name: "system-server-api-incompatibilities-with-last-released",
+    srcs: [
+        "*/system-server/api/incompatibilities.txt",
+    ],
+    cmd: "cp -f $$(echo $(in) | tr \" \" \"\\n\" | sort -t/ -k3 -n | tail -1) $(genDir)/incompatibilities.txt",
+    out: [
+        "incompatibilities.txt",
+    ],
+}
+
+genrule {
     name: "last-released-public-api-for-metalava-annotations",
     srcs: [
         "*/public/api/android.txt",