diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-11 11:35:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-11 11:35:55 +0000 |
| commit | 8bf14897b19fd1953d07bfe531ffcc271a516249 (patch) | |
| tree | b217d36cc4a4eb50f468e2c279600af07486b68c | |
| parent | e0c39a4f2199f3640bf178de110dcde5f3891101 (diff) | |
| parent | eee86809398e12c9b9f88bcfbc0716ce798dcac5 (diff) | |
| download | android_packages_apps_Gallery2-8bf14897b19fd1953d07bfe531ffcc271a516249.tar.gz android_packages_apps_Gallery2-8bf14897b19fd1953d07bfe531ffcc271a516249.tar.bz2 android_packages_apps_Gallery2-8bf14897b19fd1953d07bfe531ffcc271a516249.zip | |
Merge "Fix makefile include for support-v4" into oc-dev am: 49496305fa
am: eee8680939
Change-Id: I173a593c8cd71e6cfdb47c6d9aadf8d99dc6c323
| -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 |