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

Merge "framework.jar: Include all radio HIDL libs."

Browse Source
This commit is contained in:
Steven Moreland
2019-01-26 00:52:39 +00:00
committed by Android (Google) Code Review
parent 2bfd202ec5 e0dde65730
commit e6e4b95341
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Android.bp
View File

@@ -726,7 +726,7 @@ java_defaults {
"ext",
],
jarjar_rules: ":framework-hidl-jarjar",
jarjar_rules: "jarjar_rules_hidl.txt",
static_libs: [
"apex_aidl_interface-java",
@@ -738,6 +738,15 @@ java_defaults {
"android.hardware.cas-V1.0-java",
"android.hardware.contexthub-V1.0-java",
"android.hardware.health-V1.0-java-constants",
"android.hardware.radio-V1.0-java",
"android.hardware.radio-V1.1-java",
"android.hardware.radio-V1.2-java",
"android.hardware.radio-V1.3-java",
"android.hardware.radio-V1.4-java",
"android.hardware.radio.config-V1.0-java",
"android.hardware.radio.config-V1.1-java",
"android.hardware.radio.config-V1.2-java",
"android.hardware.radio.deprecated-V1.0-java",
"android.hardware.thermal-V1.0-java-constants",
"android.hardware.thermal-V1.0-java",
"android.hardware.thermal-V1.1-java",
@@ -746,15 +755,12 @@ java_defaults {
"android.hardware.usb-V1.0-java-constants",
"android.hardware.usb-V1.1-java-constants",
"android.hardware.usb-V1.2-java-constants",
"android.hardware.usb.gadget-V1.0-java",
"android.hardware.vibrator-V1.0-java",
"android.hardware.vibrator-V1.1-java",
"android.hardware.vibrator-V1.2-java",
"android.hardware.vibrator-V1.3-java",
"android.hardware.wifi-V1.0-java-constants",
"android.hardware.radio-V1.0-java",
"android.hardware.radio-V1.3-java",
"android.hardware.radio-V1.4-java",
"android.hardware.usb.gadget-V1.0-java",
"networkstack-aidl-interfaces-java",
"netd_aidl_interface-java",
"devicepolicyprotosnano",
@@ -788,11 +794,6 @@ filegroup {
],
}
filegroup {
name: "framework-hidl-jarjar",
srcs: ["jarjar_rules_hidl.txt"],
}
java_library {
name: "framework",
defaults: ["framework-defaults"],