Always set apex_available in SDK snapshots.
Also fix //apex_available:platform that could get lost in the generated apex_available properties. It only happened if a module didn't specify an apex_available setting and then got extra entries from apex.BaselineApexAvailable. Test: Build ART SDK with libnativeloader_lazy in the SDK, and check that the generated prebuilt module has //apex_available:platform (before https://r.android.com/1480559). Change-Id: I9df20aee63455932a7e558993f0f26769cb02792
This commit is contained in:
@@ -181,6 +181,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -192,6 +193,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -199,6 +201,7 @@ java_import {
|
||||
name: "mysdk_mypublicjavalib@current",
|
||||
sdk_member_name: "mypublicjavalib",
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/mypublicjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -206,6 +209,7 @@ java_import {
|
||||
name: "mypublicjavalib",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/mypublicjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -217,6 +221,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/mydefaultedjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -228,6 +233,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/mydefaultedjavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -238,6 +244,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myprivatejavalib.jar"],
|
||||
}
|
||||
|
||||
@@ -248,6 +255,7 @@ java_import {
|
||||
"//package",
|
||||
"//prebuilts/mysdk",
|
||||
],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myprivatejavalib.jar"],
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user