Merge "Use hidl libs from framework.jar." (8be49b9b) · Commits · e / os / android_frameworks_opt_telephony

Android.bp

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -40,16 +40,7 @@ java_library {
	"src/java/*/.logtags",		"src/java/*/.logtags",
	],		],

	jarjar_rules: ":framework-hidl-jarjar",

	libs: [		libs: [
	"voip-common",
	"ims-common",
	"services",
	],
	static_libs: [
	"telephony-protos",
	"ecc-protos-lite",
	"android.hardware.radio-V1.0-java",		"android.hardware.radio-V1.0-java",
	"android.hardware.radio-V1.1-java",		"android.hardware.radio-V1.1-java",
	"android.hardware.radio-V1.2-java",		"android.hardware.radio-V1.2-java",
	@@ -59,7 +50,13 @@ java_library {
	"android.hardware.radio.config-V1.1-java",		"android.hardware.radio.config-V1.1-java",
	"android.hardware.radio.config-V1.2-java",		"android.hardware.radio.config-V1.2-java",
	"android.hardware.radio.deprecated-V1.0-java",		"android.hardware.radio.deprecated-V1.0-java",
	"android.hidl.base-V1.0-java",		"voip-common",
			"ims-common",
			"services",
			],
			static_libs: [
			"telephony-protos",
			"ecc-protos-lite",
	"android-support-annotations",		"android-support-annotations",
	],		],