diff options
| author | Victor Chang <vichang@google.com> | 2021-05-13 23:47:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-13 23:47:34 +0000 |
| commit | d59fb76bcbcd7af98e987e31058277b40cf3f7d5 (patch) | |
| tree | 0dce995dc091e8e4c5c5bbac1f50eb02efa9659c | |
| parent | 0d6ceb67101cae87bf1be47f914567f0a39ba3c6 (diff) | |
| parent | 41ed19599d10b50c1697e3f106d7d00009472d4f (diff) | |
Merge "Revert "Add ART module-lib and system API to the collection"" into sc-dev
| -rw-r--r-- | StubLibraries.bp | 2 | ||||
| -rw-r--r-- | api/Android.bp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 4d5b09fac9e3..ed24d43eda10 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -255,7 +255,7 @@ modules_public_stubs = [ modules_system_stubs = [ "android.net.ipsec.ike.stubs.system", - "art.module.public.api.stubs", + "art.module.public.api.stubs", // Only has public stubs "conscrypt.module.public.api.stubs", // Only has public stubs "framework-appsearch.stubs.system", "framework-connectivity.stubs.system", diff --git a/api/Android.bp b/api/Android.bp index db1f64c57e2c..b85dc4613981 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -161,7 +161,6 @@ genrule { genrule { name: "frameworks-base-api-system-current.txt", srcs: [ - ":art.module.public.api{.system.api.txt}", ":android.net.ipsec.ike{.system.api.txt}", ":framework-appsearch{.system.api.txt}", ":framework-connectivity{.system.api.txt}", @@ -216,7 +215,6 @@ genrule { genrule { name: "frameworks-base-api-system-removed.txt", srcs: [ - ":art.module.public.api{.system.removed-api.txt}", ":android.net.ipsec.ike{.system.removed-api.txt}", ":framework-appsearch{.system.removed-api.txt}", ":framework-connectivity{.system.removed-api.txt}", @@ -253,7 +251,6 @@ genrule { genrule { name: "frameworks-base-api-module-lib-current.txt", srcs: [ - ":art.module.public.api{.module-lib.api.txt}", ":android.net.ipsec.ike{.module-lib.api.txt}", ":framework-appsearch{.module-lib.api.txt}", ":framework-connectivity{.module-lib.api.txt}", @@ -310,7 +307,6 @@ genrule { genrule { name: "frameworks-base-api-module-lib-removed.txt", srcs: [ - ":art.module.public.api{.module-lib.removed-api.txt}", ":android.net.ipsec.ike{.module-lib.removed-api.txt}", ":framework-appsearch{.module-lib.removed-api.txt}", ":framework-connectivity{.module-lib.removed-api.txt}", |