Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "framework-wifi & OsuLogin: set min & target SDK version to 30" into rvc-dev am: e640bbf919

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11826574

Change-Id: Ia54ef18215f79d6549506b38c6e46b391cc1c589
This commit is contained in:
David Su
2020-06-11 19:23:38 +00:00
committed by Automerger Merge Worker
parent 5b34a3678e e640bbf919
commit c4c9f2f323
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/OsuLogin/Android.bp
View File

@@ -1,5 +1,6 @@
android_app { android_app {
name: "OsuLogin", name: "OsuLogin",
defaults: ["wifi-module-sdk-version-defaults"],
static_libs: ["androidx.legacy_legacy-support-v4"], static_libs: ["androidx.legacy_legacy-support-v4"],
resource_dirs: ["res"], resource_dirs: ["res"],
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],

12
wifi/Android.bp
View File

@@ -12,6 +12,12 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
java_defaults {
name: "wifi-module-sdk-version-defaults",
min_sdk_version: "30",
target_sdk_version: "30",
}
filegroup { filegroup {
name: "framework-wifi-updatable-exported-aidl-sources", name: "framework-wifi-updatable-exported-aidl-sources",
srcs: ["aidl-export/**/*.aidl"], srcs: ["aidl-export/**/*.aidl"],
@@ -73,6 +79,7 @@ test_access_hidden_api_whitelist = [
// classes before they are renamed. // classes before they are renamed.
java_library { java_library {
name: "framework-wifi-pre-jarjar", name: "framework-wifi-pre-jarjar",
defaults: ["wifi-module-sdk-version-defaults"],
sdk_version: "module_current", sdk_version: "module_current",
static_libs: [ static_libs: [
"framework-wifi-util-lib", "framework-wifi-util-lib",
@@ -98,7 +105,10 @@ java_library {
// post-jarjar version of framework-wifi // post-jarjar version of framework-wifi
java_sdk_library { java_sdk_library {
name: "framework-wifi", name: "framework-wifi",
defaults: ["framework-module-defaults"], defaults: [
"framework-module-defaults",
"wifi-module-sdk-version-defaults",
],
static_libs: [ static_libs: [
"framework-wifi-util-lib", "framework-wifi-util-lib",
"android.hardware.wifi-V1.0-java-constants", "android.hardware.wifi-V1.0-java-constants",