Import translations. DO NOT MERGE

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

diff --git a/Android.mk b/Android.mk
index 745a2ad..6e57e81 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-compat
 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
@@ -25,6 +27,21 @@ LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
+        --extra-packages android.support.compat \
+        --extra-packages android.support.mediacompat \
+        --extra-packages android.support.coreui \
+
+ifeq ($(TARGET_BUILD_APPS),)
+    LOCAL_RESOURCE_DIR += \
+        frameworks/support/compat/res \
+        frameworks/support/media-compat/res \
+        frameworks/support/core-ui/res
+else
+    LOCAL_RESOURCE_DIR += \
+        prebuilts/sdk/current/support/compat/res \
+        prebuilts/sdk/current/support/media-compat/res \
+        prebuilts/sdk/current/support/core-ui/res
+endif
 
 LOCAL_PACKAGE_NAME := Camera2