Fix use of deprecated SoundPool API in Camera2 SoundPlayer

[android-x86/packages-apps-Camera2.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index c592046..b24a2df 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.legacy_legacy-support-v13 \
+    androidx.legacy_legacy-support-v4 \
+    androidx.core_core
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
+LOCAL_STATIC_JAVA_LIBRARIES += guava
+LOCAL_STATIC_JAVA_LIBRARIES += jsr305
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
@@ -17,23 +23,26 @@ LOCAL_RESOURCE_DIR += \
        $(LOCAL_PATH)/res \
        $(LOCAL_PATH)/res_p
 
-
 include $(LOCAL_PATH)/version.mk
+
 LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
 
-# Indirect dependency on apache due to glide, which pulls in
-# volley.
-LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Camera2
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_PRODUCT_MODULE := true
+
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+# Guava uses deprecated org.apache.http.legacy classes.
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+
 LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
 
 include $(BUILD_PACKAGE)