From 7bfceb87e1c9e23b618b3691e29b10bc149a58d9 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 29 Oct 2020 18:59:10 +0000
Subject: Move non-updatable-api/ to core/api/

This achieves two things:
- it's been noted that non-updatable-api is a confusing term as it has
  to be updated every time the API changes
- the api-review logic trigers on txt files in subdirs named 'api',
  which non-updatable-api does not trigger on

I will (less urgently) try to get rid of the term "non-updatable" from
other places too, perhaps going for "non-module" or "core" as a
replacement.

Bug: 171029603
Test: m checkapi
Change-Id: I843efb4880b6caaf3872e9b0918fd710fb93d979
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
---
 StubLibraries.bp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'StubLibraries.bp')

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",
-- 
cgit v1.2.3