diff options
author | Alan Viverette <alanv@google.com> | 2017-05-11 05:39:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-11 05:39:02 +0000 |
commit | eee86809398e12c9b9f88bcfbc0716ce798dcac5 (patch) | |
tree | 4c7050d14790ec25f67bd9c2de346d326488497b | |
parent | bd69754242c9203372c1fe18db01cc220cd28bd5 (diff) | |
parent | 49496305fafa26e9a07897b914579adf84a89874 (diff) | |
download | android_packages_apps_Gallery2-eee86809398e12c9b9f88bcfbc0716ce798dcac5.tar.gz android_packages_apps_Gallery2-eee86809398e12c9b9f88bcfbc0716ce798dcac5.tar.bz2 android_packages_apps_Gallery2-eee86809398e12c9b9f88bcfbc0716ce798dcac5.zip |
Merge "Fix makefile include for support-v4" into oc-dev
am: 49496305fa
Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3
-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 |