Merge "Enabling Apex in BT" into tm-dev am: f840cd9853 (d550f3aa) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+32 −10

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ java_library {
		name: "bluetooth.mapsapi",

		srcs: ["lib/mapapi/*/.java"],
		min_sdk_version: "current",
		sdk_version: "module_current",
		}

		java_library {
		@@ -39,6 +41,11 @@ java_library {

		srcs: [":framework-mms-shared-srcs"],
		libs: ["unsupportedappusage"],
		apex_available: [
		"com.android.bluetooth",
		],
		min_sdk_version: "current",
		sdk_version: "module_current",
		}

		// Bluetooth JNI
		@@ -71,6 +78,10 @@ cc_library_shared {
		sanitize: {
		scs: true,
		},
		apex_available: [
		"com.android.bluetooth",
		],
		min_sdk_version: "current",
		}

		// Bluetooth APK
		@@ -84,12 +95,21 @@ android_app {
		":statslog-bluetooth-java-gen",
		":bluetooth-proto-enums-java-gen",
		],
		platform_apis: true,
		platform_apis: false,
		certificate: "platform",

		jni_libs: ["libbluetooth_jni"],
		jarjar_rules: ":bluetooth-jarjar-rules",

		jni_uses_platform_apis: true,
		libs: [
		"services.net",
		"framework-bluetooth-pre-jarjar",
		"framework-statsd.stubs.module_lib",
		"framework-tethering.stubs.module_lib",
		"framework-connectivity.stubs.module_lib",
		"framework-mediaprovider",
		"unsupportedappusage",
		"framework-annotations-lib",
		"error_prone_annotations",
		],
		static_libs: [
		"android.hardware.radio-V1.0-java",
		@@ -97,6 +117,7 @@ android_app {
		"androidx.legacy_legacy-support-v4",
		"androidx.lifecycle_lifecycle-livedata",
		"androidx.room_room-runtime",
		"androidx.annotation_annotation",
		"bluetooth.mapsapi",
		"bluetooth.obex",
		"bluetooth-protos-lite",
		@@ -109,8 +130,9 @@ android_app {
		"modules-utils-synchronous-result-receiver",
		"modules-utils-statemachine",
		"sap-api-java-static",
		"services.net",
		"PlatformProperties"
		"net-utils-services-common",
		"networkstack-client",
		"PlatformProperties",
		],

		plugins: [
		@@ -123,9 +145,7 @@ android_app {
		optimize: {
		enabled: false,
		},
		required: ["libbluetooth"],
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth",
		],
		errorprone: {
		@@ -133,6 +153,8 @@ android_app {
		// "-Xep:AndroidFrameworkRequiresPermission:ERROR",
		],
		},
		min_sdk_version: "current",
		sdk_version: "module_current",
		}

		gensrcs {
		@@ -164,8 +186,8 @@ gensrcs {
		genrule {
		name: "statslog-bluetooth-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module bluetooth"
		+ " --javaPackage com.android.bluetooth --javaClass BluetoothStatsLog"
		+ " --minApiLevel 32",
		cmd: "$(location stats-log-api-gen) --java $(out) --module bluetooth" +
		" --javaPackage com.android.bluetooth --javaClass BluetoothStatsLog" +
		" --minApiLevel 32",
		out: ["com/android/bluetooth/BluetoothStatsLog.java"],
		}

android/app/lib/obex/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -33,4 +33,9 @@ java_library {
		name: "bluetooth.obex",

		srcs: ["*/.java"],
		apex_available: [
		"com.android.bluetooth",
		],
		min_sdk_version: "current",
		sdk_version: "module_current",
		}

android/app/tests/robotests/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ LOCAL_INSTRUMENTATION_FOR := Bluetooth

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_STATIC_JAVA_LIBRARY)
		#include $(BUILD_STATIC_JAVA_LIBRARY)

		#############################################################
		# Bluetooth runner target to run the previous target. #
		@@ -48,4 +48,4 @@ LOCAL_TEST_PACKAGE := Bluetooth

		LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src

		include external/robolectric-shadows/run_robotests.mk
		#include external/robolectric-shadows/run_robotests.mk

android/app/tests/unit/Android.bp

+9 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,10 @@ android_test {

		// We only want this apk build for tests.
		certificate: "platform",
		defaults: ["framework-bluetooth-tests-defaults"],

		min_sdk_version: "current",
		target_sdk_version: "current",
		libs: [
		"javax.obex",
		"android.test.runner",
		@@ -27,18 +30,21 @@ android_test {
		"androidx.room_room-runtime",
		"androidx.room_room-testing",
		"truth-prebuilt",
		"PlatformProperties"
		"PlatformProperties",
		"framework-bluetooth-pre-jarjar",
		],

		asset_dirs: ["src/com/android/bluetooth/btservice/storage/schemas"],

		// Include all test java files.
		srcs: ["src/*/.java"],

		jacoco: {
		include_filter: ["android.bluetooth.*"],
		exclude_filter: [],
		},
		platform_apis: true,

		test_suites: ["device-tests"],

		instrumentation_for: "Bluetooth",

		}

apex/Android.bp

+71 −11

Original line number	Diff line number	Diff line
		@@ -7,22 +7,40 @@ package {
		default_applicable_licenses: ["system_bt_license"],
		}

		apex {
		name: "com.android.bluetooth",
		enabled: false,

		manifest: "apex_manifest.json",
		apex_defaults {
		name: "com.android.bluetooth-defaults",
		bootclasspath_fragments: ["com.android.bluetooth-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.bluetooth-systemserverclasspath-fragment"],
		apps: ["Bluetooth"],

		multilib: {
		first: {
		// Extractor process runs only with the primary ABI.
		native_shared_libs: [
		"libbluetooth",
		],
		jni_libs: [
		"libbluetooth_jni",
		"libbluetooth"
		],
		apps: ["Bluetooth"],

		compile_multilib: "both",
		},
		},

		key: "com.android.bluetooth.key",
		certificate: ":com.android.bluetooth.certificate",
		min_sdk_version: "current",

		updatable: false,
		future_updatable: true,
		// Indicates that pre-installed version of this apex can be compressed.
		// Whether it actually will be compressed is controlled on per-device basis.
		compressible: true,
		}

		//Mainline bluetooth apex module.
		apex {
		name: "com.android.bluetooth",
		defaults: ["com.android.bluetooth-defaults"],
		manifest: "apex_manifest.json",
		}

		apex_key {
		@@ -35,3 +53,45 @@ android_app_certificate {
		name: "com.android.bluetooth.certificate",
		certificate: "com.android.bluetooth",
		}

		sdk {
		name: "bluetooth-module-sdk",
		bootclasspath_fragments: ["com.android.bluetooth-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.bluetooth-systemserverclasspath-fragment"],
		}

		// Encapsulate the contributions made by the com.android.bluetooth to the bootclasspath.
		bootclasspath_fragment {
		name: "com.android.bluetooth-bootclasspath-fragment",
		contents: ["framework-bluetooth"],
		apex_available: ["com.android.bluetooth"],

		// The bootclasspath_fragments that provide APIs on which this depends.
		fragments: [
		{
		apex: "com.android.art",
		module: "art-bootclasspath-fragment",
		},
		],

		// Additional stubs libraries that this fragment's contents use which are
		// not provided by another bootclasspath_fragment.
		additional_stubs: [
		"android-non-updatable",
		],

		// Additional hidden API flag files to override the defaults. This must only be
		// modified by the Soong or platform compat team.
		hidden_api: {
		max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
		max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
		unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
		},

		}

		systemserverclasspath_fragment {
		name: "com.android.bluetooth-systemserverclasspath-fragment",
		standalone_contents: ["service-bluetooth"],
		apex_available: ["com.android.bluetooth"],
		}