diff --git a/apex/Android.bp b/apex/Android.bp
index 67cd0d7..51e030b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -74,6 +74,9 @@
             api_file: "api/current.txt",
             removed_api_file: "api/removed.txt",
         },
+        api_lint: {
+            enabled: true,
+        },
     },
     dist: {
         targets: ["sdk", "win_sdk"],
@@ -93,6 +96,9 @@
             api_file: "api/system-current.txt",
             removed_api_file: "api/system-removed.txt",
         },
+        api_lint: {
+            enabled: true,
+        },
     },
     dist: {
         targets: ["sdk", "win_sdk"],
@@ -147,6 +153,9 @@
             api_file: "api/module-lib-current.txt",
             removed_api_file: "api/module-lib-removed.txt",
         },
+        api_lint: {
+            enabled: true,
+        },
     },
     dist: {
         targets: ["sdk", "win_sdk"],
@@ -173,6 +182,9 @@
             api_file: "api/current.txt",
             removed_api_file: "api/removed.txt",
         },
+        api_lint: {
+            enabled: true,
+        },
     },
     dist: {
         targets: ["sdk", "win_sdk"],
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index a1c886a..3bc4f7b 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -102,6 +102,15 @@
         "framework-media-stubs-srcs-defaults",
         "framework-module-stubs-defaults-publicapi",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-media.api.public.latest",
+            removed_api_file: ":framework-media-removed.api.public.latest",
+        },
+        api_lint: {
+            new_since: ":framework-media.api.public.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -110,6 +119,15 @@
         "framework-media-stubs-srcs-defaults",
         "framework-module-stubs-defaults-systemapi",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-media.api.system.latest",
+            removed_api_file: ":framework-media-removed.api.system.latest",
+        },
+        api_lint: {
+            new_since: ":framework-media.api.system.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -118,6 +136,15 @@
         "framework-media-stubs-srcs-defaults",
         "framework-module-api-defaults-module_libs_api",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-media.api.module-lib.latest",
+            removed_api_file: ":framework-media-removed.api.module-lib.latest",
+        },
+        api_lint: {
+            new_since: ":framework-media.api.module-lib.latest",
+        },
+    },
 }
 
 droidstubs {
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index 3119b7d..68c27a8 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -55,6 +55,15 @@
         "framework-module-stubs-defaults-publicapi",
         "framework-permission-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-permission.api.public.latest",
+            removed_api_file: ":framework-permission-removed.api.public.latest",
+        },
+        api_lint: {
+            new_since: ":framework-permission.api.public.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -63,6 +72,15 @@
         "framework-module-stubs-defaults-systemapi",
         "framework-permission-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-permission.api.system.latest",
+            removed_api_file: ":framework-permission-removed.api.system.latest",
+        },
+        api_lint: {
+            new_since: ":framework-permission.api.system.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -71,6 +89,15 @@
         "framework-module-api-defaults-module_libs_api",
         "framework-permission-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-permission.api.module-lib.latest",
+            removed_api_file: ":framework-permission-removed.api.module-lib.latest",
+        },
+        api_lint: {
+            new_since: ":framework-permission.api.module-lib.latest",
+        },
+    },
 }
 
 droidstubs {
diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 2d92d00..6144976 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -41,6 +41,15 @@
     name: "service-permission-stubs-srcs",
     srcs: [ ":service-permission-sources" ],
     defaults: ["service-module-stubs-srcs-defaults"],
+    check_api: {
+        last_released: {
+            api_file: ":service-permission.api.system-server.latest",
+            removed_api_file: ":service-permission-removed.api.system-server.latest",
+        },
+        api_lint: {
+            new_since: ":service-permission.api.system-server.latest",
+        },
+    },
     visibility: ["//visibility:private"],
     dist: { dest: "service-permission.txt" },
 }
diff --git a/apex/sdkextensions/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
index 6a78711..14e23ed 100644
--- a/apex/sdkextensions/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -57,6 +57,15 @@
         "framework-module-stubs-defaults-publicapi",
         "framework-sdkextensions-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-sdkextensions.api.public.latest",
+            removed_api_file: ":framework-sdkextensions-removed.api.public.latest",
+        },
+        api_lint: {
+            new_since: ":framework-sdkextensions.api.public.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -65,6 +74,15 @@
         "framework-module-stubs-defaults-systemapi",
         "framework-sdkextensions-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-sdkextensions.api.system.latest",
+            removed_api_file: ":framework-sdkextensions-removed.api.system.latest",
+        },
+        api_lint: {
+            new_since: ":framework-sdkextensions.api.system.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -73,6 +91,15 @@
         "framework-module-api-defaults-module_libs_api",
         "framework-sdkextensions-stubs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-sdkextensions.api.module-lib.latest",
+            removed_api_file: ":framework-sdkextensions-removed.api.module-lib.latest",
+        },
+        api_lint: {
+            new_since: ":framework-sdkextensions.api.module-lib.latest",
+        },
+    },
 }
 
 droidstubs {
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 7d0f2ee..9f5d933 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -93,6 +93,15 @@
         "framework-module-stubs-defaults-publicapi",
         "framework-statsd-stubs-srcs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-statsd.api.public.latest",
+            removed_api_file: ":framework-statsd-removed.api.public.latest",
+        },
+        api_lint: {
+            new_since: ":framework-statsd.api.public.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -101,6 +110,15 @@
         "framework-module-stubs-defaults-systemapi",
         "framework-statsd-stubs-srcs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-statsd.api.system.latest",
+            removed_api_file: ":framework-statsd-removed.api.system.latest",
+        },
+        api_lint: {
+            new_since: ":framework-statsd.api.system.latest",
+        },
+    },
 }
 
 droidstubs {
@@ -109,6 +127,15 @@
         "framework-module-api-defaults-module_libs_api",
         "framework-statsd-stubs-srcs-defaults",
     ],
+    check_api: {
+        last_released: {
+            api_file: ":framework-statsd.api.module-lib.latest",
+            removed_api_file: ":framework-statsd-removed.api.module-lib.latest",
+        },
+        api_lint: {
+            new_since: ":framework-statsd.api.module-lib.latest",
+        },
+    },
 }
 
 droidstubs {