diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-11 02:55:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-11 02:55:04 +0000 |
| commit | 49496305fafa26e9a07897b914579adf84a89874 (patch) | |
| tree | f1a64c6a41001b7ada415db143bc6d93642341de | |
| parent | 907cd0546f4de1c617a4cbfec1db20bec85e7634 (diff) | |
| parent | 30eb6ef7beca28ee3390ad9b9ce8537e547d611f (diff) | |
| download | android_packages_apps_Gallery2-49496305fafa26e9a07897b914579adf84a89874.tar.gz android_packages_apps_Gallery2-49496305fafa26e9a07897b914579adf84a89874.tar.bz2 android_packages_apps_Gallery2-49496305fafa26e9a07897b914579adf84a89874.zip | |
Merge "Fix makefile include for support-v4" into oc-dev
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 47e9c864c..d539141eb 100644 --- a/Android.mk +++ b/Android.mk @@ -4,8 +4,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-v4 \ + android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser |