diff options
| author | 2020-03-20 12:48:31 +0000 | |
|---|---|---|
| committer | 2020-03-20 12:48:31 +0000 | |
| commit | 51ef4aafe28fd17c0108f5af89b25927ddf2865b (patch) | |
| tree | 2b82c733f35cb1955b94ed4ba70db22c1e5afbc9 | |
| parent | 6360640cd807ce9f6719ee6435c0cb108da12c53 (diff) | |
| parent | e53bec056745ece415379abe92ed7e2f41d10e71 (diff) | |
Merge "Remove SDK dep from module_lib_api"
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | StubLibraries.bp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 7ceb727d1890..8c2d236ec076 100644 --- a/Android.bp +++ b/Android.bp @@ -409,7 +409,6 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "framework-updatable-stubs-module_libs_api", ], jarjar_rules: ":framework-jarjar-rules", @@ -475,6 +474,7 @@ java_library { "libcore-platform-compat-config", "services-platform-compat-config", ], + libs: ["framework-updatable-stubs-module_libs_api"], static_libs: [ // If MimeMap ever becomes its own APEX, then this dependency would need to be removed // in favor of an API stubs dependency in java_library "framework" below. @@ -519,6 +519,7 @@ java_library { visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST "//external/robolectric-shadows:__subpackages__", + "//frameworks/base", "//frameworks/layoutlib:__subpackages__", ], } diff --git a/StubLibraries.bp b/StubLibraries.bp index e8aa3936d889..9a52cf69ef3d 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -71,7 +71,8 @@ stubs_defaults { stubs_defaults { name: "metalava-non-updatable-api-stubs-default", defaults: ["metalava-base-api-stubs-default"], - sdk_version: "system_current", + sdk_version: "core_platform", + libs: ["framework-all"], } ///////////////////////////////////////////////////////////////////// |