summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2022-03-10 17:36:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-10 17:36:22 +0000
commit52005fb6d014c048c537bb36cf358554ff84a37e (patch)
tree1a783d2f725e9a8dc51892c3790410e2c30a460d
parent33cee096d4c9382aa16df86766f955b3dac913ff (diff)
parentebddedfd9b4380607eed95decbe5178516bca976 (diff)
Merge "Move android.jar defaults back to f/b" am: ebddedfd9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006831 Change-Id: I0a9026889a6428dbd8797e8522d015e2417cb378
-rw-r--r--StubLibraries.bp10
1 files changed, 10 insertions, 0 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index fef95e813ec7..32101c791242 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -208,6 +208,16 @@ droidstubs {
/////////////////////////////////////////////////////////////////////
java_defaults {
+ name: "android.jar_defaults",
+ sdk_version: "none",
+ system_modules: "none",
+ java_version: "1.8",
+ compile_dex: true,
+ defaults_visibility: ["//visibility:private"],
+ visibility: ["//visibility:public"],
+}
+
+java_defaults {
name: "android-non-updatable_defaults_stubs_current",
libs: ["stub-annotations"],
static_libs: ["framework-res-package-jar"], // Export package of framework-res