9 files changed, 7 insertions, 7 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index e0c302239464..b4c14720060f 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -148,8 +148,8 @@ droidstubs {
     args: metalava_framework_docs_args,
     check_api: {
         current: {
-            api_file: "non-updatable-api/current.txt",
-            removed_api_file: "non-updatable-api/removed.txt",
+            api_file: "core/api/current.txt",
+            removed_api_file: "core/api/removed.txt",
         },
         last_released: {
             api_file: ":android-non-updatable.api.public.latest",
@@ -208,8 +208,8 @@ droidstubs {
     args: metalava_framework_docs_args + priv_apps,
     check_api: {
         current: {
-            api_file: "non-updatable-api/system-current.txt",
-            removed_api_file: "non-updatable-api/system-removed.txt",
+            api_file: "core/api/system-current.txt",
+            removed_api_file: "core/api/system-removed.txt",
         },
         last_released: {
             api_file: ":android-non-updatable.api.system.latest",
@@ -219,7 +219,7 @@ droidstubs {
         api_lint: {
             enabled: true,
             new_since: ":android-non-updatable.api.system.latest",
-            baseline_file: "non-updatable-api/system-lint-baseline.txt",
+            baseline_file: "core/api/system-lint-baseline.txt",
         },
     },
 }
@@ -291,8 +291,8 @@ droidstubs {
     args: metalava_framework_docs_args + priv_apps + module_libs,
     check_api: {
         current: {
-            api_file: "non-updatable-api/module-lib-current.txt",
-            removed_api_file: "non-updatable-api/module-lib-removed.txt",
+            api_file: "core/api/module-lib-current.txt",
+            removed_api_file: "core/api/module-lib-removed.txt",
         },
         last_released: {
             api_file: ":android-non-updatable.api.module-lib.latest",
diff --git a/non-updatable-api/Android.bp b/core/api/Android.bp
index 00b901992b90..00b901992b90 100644
--- a/non-updatable-api/Android.bp
+++ b/core/api/Android.bp
diff --git a/non-updatable-api/current.txt b/core/api/current.txt
index 4a449049cafd..4a449049cafd 100644
--- a/non-updatable-api/current.txt
+++ b/core/api/current.txt
diff --git a/non-updatable-api/module-lib-current.txt b/core/api/module-lib-current.txt
index 198134edbb5b..198134edbb5b 100644
--- a/non-updatable-api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
diff --git a/non-updatable-api/module-lib-removed.txt b/core/api/module-lib-removed.txt
index d802177e249b..d802177e249b 100644
--- a/non-updatable-api/module-lib-removed.txt
+++ b/core/api/module-lib-removed.txt
diff --git a/non-updatable-api/removed.txt b/core/api/removed.txt
index 3655af222248..3655af222248 100644
--- a/non-updatable-api/removed.txt
+++ b/core/api/removed.txt
diff --git a/non-updatable-api/system-current.txt b/core/api/system-current.txt
index 95fc15254cd4..95fc15254cd4 100644
--- a/non-updatable-api/system-current.txt
+++ b/core/api/system-current.txt
diff --git a/non-updatable-api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt
index 395ddc16913d..395ddc16913d 100644
--- a/non-updatable-api/system-lint-baseline.txt
+++ b/core/api/system-lint-baseline.txt
diff --git a/non-updatable-api/system-removed.txt b/core/api/system-removed.txt
index 0c02c43b1084..0c02c43b1084 100644
--- a/non-updatable-api/system-removed.txt
+++ b/core/api/system-removed.txt