diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-11 20:30:52 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-09-12 18:10:57 -0700 |
commit | a5a08d7642a1fdf961b057cc90e76c4c93103c15 (patch) | |
tree | b9681bfdc4935424736aec2e6d11e3b0b48e13b1 /Android.mk | |
parent | 742cd5b18e1899bee1d430b61891238c0f3502b6 (diff) | |
download | android_packages_apps_Camera2-a5a08d7642a1fdf961b057cc90e76c4c93103c15.tar.gz android_packages_apps_Camera2-a5a08d7642a1fdf961b057cc90e76c4c93103c15.tar.bz2 android_packages_apps_Camera2-a5a08d7642a1fdf961b057cc90e76c4c93103c15.zip |
Bring back tiny planet to the Camera filmstrip
Bug: 10393598
The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.
Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index ef4772844..285e59543 100644 --- a/Android.mk +++ b/Android.mk @@ -30,9 +30,9 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags # the libraries in the APK, otherwise just put them in /system/lib and # leave them out of the APK ifneq (,$(TARGET_BUILD_APPS)) - LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic + LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_tinyplanet else - LOCAL_REQUIRED_MODULES := libjni_mosaic + LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_tinyplanet endif include $(BUILD_PACKAGE) |