summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2021-04-12 09:52:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-12 09:52:58 +0000
commit9ed545c4e77fb9465d935ebdd1292c4f14a9b840 (patch)
tree9a3d5755c559031d8d5ca89610f63933670639d5
parentc26f163ad38cb0dd8ba664781e82e2375449f4b8 (diff)
parente93771bfcafa2cc402ee1e6b5016f5817381e671 (diff)
Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671727 Change-Id: Id55afc826b3d874f125922dc651e3dde652b8ad8
-rw-r--r--StubLibraries.bp17
1 files changed, 17 insertions, 0 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index ccb09fba88ca..41cbb6a534fe 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -311,6 +311,11 @@ java_defaults {
system_modules: "none",
java_version: "1.8",
compile_dex: true,
+ dist: {
+ targets: ["sdk", "win_sdk"],
+ tag: ".jar",
+ dest: "android-non-updatable.jar",
+ }
}
java_library_static {
@@ -318,6 +323,9 @@ java_library_static {
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":api-stubs-docs-non-updatable"],
libs: modules_public_stubs,
+ dist: {
+ dir: "apistubs/android/public",
+ },
}
java_library_static {
@@ -325,6 +333,9 @@ java_library_static {
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [ ":system-api-stubs-docs-non-updatable" ],
libs: modules_system_stubs,
+ dist: {
+ dir: "apistubs/android/system",
+ },
}
java_library_static {
@@ -336,6 +347,9 @@ java_library_static {
// NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike",
],
+ dist: {
+ dir: "apistubs/android/module-lib",
+ },
}
java_library_static {
@@ -343,6 +357,9 @@ java_library_static {
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":test-api-stubs-docs-non-updatable"],
libs: modules_system_stubs,
+ dist: {
+ dir: "apistubs/android/test",
+ },
}
java_defaults {