Merge "Change Bluetooth apex mountpoint" into tm-dev (8f603bd9) · Commits · e / os / android_packages_modules_Bluetooth

apex/Android.bp

+12 −12

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ package {
		}

		linker_config {
		name: "bluetooth-linker-config",
		name: "btservices-linker-config",
		src: "linker.config.json",
		installable: false,
		}
		@@ -19,8 +19,8 @@ apex {
		name: "com.android.bluetooth",
		defaults: ["t-launched-apex-module"],
		manifest: "apex_manifest.json",
		bootclasspath_fragments: ["com.android.bluetooth-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.bluetooth-systemserverclasspath-fragment"],
		bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
		apps: ["Bluetooth"],

		multilib: {
		@@ -37,7 +37,7 @@ apex {
		"audio_set_configurations_json",
		"audio_set_scenarios_bfbs",
		"audio_set_scenarios_json",
		"bluetooth-linker-config",
		"btservices-linker-config",
		"bt_did.conf",
		"bt_stack.conf",
		"privapp_allowlist_com.android.bluetooth.xml",
		@@ -53,8 +53,8 @@ apex {
		name: "com.android.btservices",
		defaults: ["t-launched-apex-module"],
		manifest: "apex_manifest.json",
		bootclasspath_fragments: ["com.android.bluetooth-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.bluetooth-systemserverclasspath-fragment"],
		bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
		apps: ["Bluetooth"],

		multilib: {
		@@ -71,7 +71,7 @@ apex {
		"audio_set_configurations_json",
		"audio_set_scenarios_bfbs",
		"audio_set_scenarios_json",
		"bluetooth-linker-config",
		"btservices-linker-config",
		"bt_did.conf",
		"bt_stack.conf",
		"privapp_allowlist_com.android.bluetooth.xml",
		@@ -94,14 +94,14 @@ android_app_certificate {
		}

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

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

		@@ -151,7 +151,7 @@ bootclasspath_fragment {
		}

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

apex/apex_manifest.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		"provideSharedApexLibs": false,
		"requireSharedApexLibs": [
		],
		"name": "com.android.bluetooth",
		"name": "com.android.btservices",
		"requireNativeLibs": [
		"libaptX_encoder.so",
		"libaptXHD_encoder.so"

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+7 −6

Original line number	Diff line number	Diff line
		@@ -40,15 +40,16 @@ using ::le_audio::CodecManager;
		#ifdef OS_ANDROID
		static const std::vector<
		std::pair<const char* /schema/, const char* /content/>>
		kLeAudioSetConfigs = {{"/apex/com.android.bluetooth/etc/bluetooth/le_audio/"
		kLeAudioSetConfigs = {
		{"/apex/com.android.btservices/etc/bluetooth/le_audio/"
		"audio_set_configurations.bfbs",
		"/apex/com.android.bluetooth/etc/bluetooth/le_audio/"
		"/apex/com.android.btservices/etc/bluetooth/le_audio/"
		"audio_set_configurations.json"}};
		static const std::vector<
		std::pair<const char* /schema/, const char* /content/>>
		kLeAudioSetScenarios = {{"/apex/com.android.bluetooth/etc/bluetooth/"
		kLeAudioSetScenarios = {{"/apex/com.android.btservices/etc/bluetooth/"
		"le_audio/audio_set_scenarios.bfbs",
		"/apex/com.android.bluetooth/etc/bluetooth/"
		"/apex/com.android.btservices/etc/bluetooth/"
		"le_audio/audio_set_scenarios.json"}};
		#else
		static const std::vector<

system/btif/src/btif_core.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ static void bt_jni_msg_ready(void* context);
		#define BTE_DID_CONF_FILE "bt_did.conf"
		#else // !defined(OS_GENERIC)
		#define BTE_DID_CONF_FILE \
		"/apex/com.android.bluetooth/etc/bluetooth/bt_did.conf"
		"/apex/com.android.btservices/etc/bluetooth/bt_did.conf"
		#endif // defined(OS_GENERIC)
		#endif // BTE_DID_CONF_FILE

system/main/stack_config.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static future_t* init() {
		#elif defined(OS_GENERIC)
		const char* path = "bt_stack.conf";
		#else // !defined(OS_GENERIC)
		const char* path = "/apex/com.android.bluetooth/etc/bluetooth/bt_stack.conf";
		const char* path = "/apex/com.android.btservices/etc/bluetooth/bt_stack.conf";
		#endif // defined(OS_GENERIC)
		CHECK(path != NULL);