Rebrand to BluetoothQti
* Rename apk and jni
* Disable tests and java libs to avoid conflict with AOSP app
Change-Id: If6ece05802ef7decb50b16cdef54b8b50bb9c68c
diff --git a/Android.mk b/Android.mk
index bbc354d..7f806ef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, lib/mapapi)
-LOCAL_MODULE := bluetooth.mapsapi
+LOCAL_MODULE := bluetooth_qti.mapsapi
include $(BUILD_STATIC_JAVA_LIBRARY)
# Bluetooth APK
@@ -15,19 +15,19 @@
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
- $(call all-java-files-under, ../../../vendor/qcom/opensource/bluetooth_ext/packages_apps_bluetooth_ext/src) \
- $(call all-java-files-under, ../../../vendor/qcom/opensource/commonsys/bluetooth_ext/packages_apps_bluetooth_ext/src)
+ $(call all-java-files-under, ../../../bluetooth_ext/packages_apps_bluetooth_ext/src)
-LOCAL_PACKAGE_NAME := Bluetooth
+LOCAL_PACKAGE_NAME := BluetoothQti
+LOCAL_OVERRIDES_PACKAGES := Bluetooth
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_USE_AAPT2 := true
-LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni
+LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_qti_jni
LOCAL_JAVA_LIBRARIES := javax.obex telephony-common services.net
LOCAL_STATIC_JAVA_LIBRARIES := \
com.android.vcard \
- bluetooth.mapsapi \
+ bluetooth_qti.mapsapi \
sap-api-java-static \
services.net \
libprotobuf-java-lite \
@@ -60,28 +60,8 @@
LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon
LOCAL_PROTOC_OPTIMIZE_TYPE := micro
-LOCAL_REQUIRED_MODULES := libbluetooth
+LOCAL_REQUIRED_MODULES := libbluetooth_qti
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
-
-include $(CLEAR_VARS)
-
-COMMON_LIBS_PATH := ../../../../../prebuilts/tools/common/m2/repository
-ROOM_LIBS_PATH := ../../lib/room
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- bt-androidx-annotation-nodeps:$(ROOM_LIBS_PATH)/annotation-1.0.0-beta01.jar \
- bt-androidx-room-common-nodeps:$(ROOM_LIBS_PATH)/room-common-2.0.0-beta01.jar \
- bt-androidx-room-compiler-nodeps:$(ROOM_LIBS_PATH)/room-compiler-2.0.0-beta01.jar \
- bt-androidx-room-migration-nodeps:$(ROOM_LIBS_PATH)/room-migration-2.0.0-beta01.jar \
- bt-antlr4-nodeps:$(COMMON_LIBS_PATH)/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar \
- bt-apache-commons-codec-nodeps:$(COMMON_LIBS_PATH)/org/eclipse/tycho/tycho-bundles-external/0.18.1/eclipse/plugins/org.apache.commons.codec_1.4.0.v201209201156.jar \
- bt-auto-common-nodeps:$(COMMON_LIBS_PATH)/com/google/auto/auto-common/0.9/auto-common-0.9.jar \
- bt-javapoet-nodeps:$(COMMON_LIBS_PATH)/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \
- bt-kotlin-metadata-nodeps:$(COMMON_LIBS_PATH)/me/eugeniomarletti/kotlin-metadata/1.2.1/kotlin-metadata-1.2.1.jar \
- bt-sqlite-jdbc-nodeps:$(COMMON_LIBS_PATH)/org/xerial/sqlite-jdbc/3.20.1/sqlite-jdbc-3.20.1.jar \
- bt-jetbrain-nodeps:../../../../../prebuilts/tools/common/m2/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar
-
-include $(BUILD_HOST_PREBUILT)
diff --git a/jni/Android.bp b/jni/Android.bp
index 52f653a..a1fed68 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -1,5 +1,5 @@
cc_library_shared {
- name: "libbluetooth_jni",
+ name: "libbluetooth_qti_jni",
compile_multilib: "first",
srcs: [
"bluetooth_socket_manager.cc",
diff --git a/src/com/android/bluetooth/btservice/AdapterApp.java b/src/com/android/bluetooth/btservice/AdapterApp.java
index 0c22c7c..ba3ed68 100644
--- a/src/com/android/bluetooth/btservice/AdapterApp.java
+++ b/src/com/android/bluetooth/btservice/AdapterApp.java
@@ -33,7 +33,7 @@
if (DBG) {
Log.d(TAG, "Loading JNI Library");
}
- System.loadLibrary("bluetooth_jni");
+ System.loadLibrary("bluetooth_qti_jni");
}
public AdapterApp() {
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 562a32e..9ed0010 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -182,7 +182,7 @@
private final ArrayList<DiscoveringPackage> mDiscoveringPackages = new ArrayList<>();
static {
- System.loadLibrary("bluetooth_jni");
+ System.loadLibrary("bluetooth_qti_jni");
classInitNative();
}
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index bddb0a5..d93ff14 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -191,7 +191,7 @@
static {
if (DBG) Log.d(TAG, "classInitNative called");
- System.loadLibrary("bluetooth_jni");
+ System.loadLibrary("bluetooth_qti_jni");
classInitNative();
}
diff --git a/tests/Android.mk b/tests/Android.mk_disabled
similarity index 100%
rename from tests/Android.mk
rename to tests/Android.mk_disabled