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 
am: 3c7ac4e991

Change-Id: Ib45dc36987acd944f0abe9496b62701557d18e2e
This commit is contained in:
Steven Moreland
2019-01-28 19:44:18 -08:00
committed by android-build-merger
parent f1c0ec00a3 3c7ac4e991
commit 9bb477afb6
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

@@ -674,7 +674,7 @@ java_defaults {
"ext",
],
jarjar_rules: ":framework-hidl-jarjar",
jarjar_rules: "jarjar_rules_hidl.txt",
static_libs: [
"apex_aidl_interface-java",
@@ -684,18 +684,24 @@ 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.tv.input-V1.0-java-constants",
"android.hardware.usb-V1.0-java-constants",
"android.hardware.usb-V1.1-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.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",
],
@@ -730,11 +736,6 @@ filegroup {
],
}
filegroup {
name: "framework-hidl-jarjar",
srcs: ["jarjar_rules_hidl.txt"],
}
java_library {
name: "framework",
defaults: ["framework-defaults"],