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 28785f7..b24a2df 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -5,10 +5,11 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-        android-support-v4 \
-        android-support-v13
+    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 := android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
 LOCAL_STATIC_JAVA_LIBRARIES += guava
@@ -22,18 +23,21 @@ LOCAL_RESOURCE_DIR += \
        $(LOCAL_PATH)/res \
        $(LOCAL_PATH)/res_p
 
-LOCAL_USE_AAPT2 := true
-
 include $(LOCAL_PATH)/version.mk
+
 LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
 
+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.