Merge "framework.jar: Include all radio HIDL libs." am: 3c7ac4e991 (4d231115) · Commits · e / os / android_frameworks_base

Android.bp

+11 −10

Original line number	Diff line number	Diff line
		@@ -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"],