diff options
| author | Anton Hansson <hansson@google.com> | 2020-10-30 15:22:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-30 15:22:45 +0000 |
| commit | ad2bb796b00004d6ba311145dc2a3026a2dc2b4d (patch) | |
| tree | adc4d91739261aa7d656e9af5ddc270eafbddc68 | |
| parent | a13966feea438e1f4bf79157a04b4d64277c4a4d (diff) | |
| parent | 7bfceb87e1c9e23b618b3691e29b10bc149a58d9 (diff) | |
Merge "Move non-updatable-api/ to core/api/"
| -rw-r--r-- | StubLibraries.bp | 14 | ||||
| -rw-r--r-- | core/api/Android.bp (renamed from non-updatable-api/Android.bp) | 0 | ||||
| -rw-r--r-- | core/api/current.txt (renamed from non-updatable-api/current.txt) | 0 | ||||
| -rw-r--r-- | core/api/module-lib-current.txt (renamed from non-updatable-api/module-lib-current.txt) | 0 | ||||
| -rw-r--r-- | core/api/module-lib-removed.txt (renamed from non-updatable-api/module-lib-removed.txt) | 0 | ||||
| -rw-r--r-- | core/api/removed.txt (renamed from non-updatable-api/removed.txt) | 0 | ||||
| -rw-r--r-- | core/api/system-current.txt (renamed from non-updatable-api/system-current.txt) | 0 | ||||
| -rw-r--r-- | core/api/system-lint-baseline.txt (renamed from non-updatable-api/system-lint-baseline.txt) | 0 | ||||
| -rw-r--r-- | core/api/system-removed.txt (renamed from non-updatable-api/system-removed.txt) | 0 |
9 files changed, 7 insertions, 7 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 3d28bf812ec6..9047df5aba5c 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", }, }, } @@ -264,8 +264,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 |