diff options
| author | Michael Kolb <kolby@google.com> | 2013-01-29 20:51:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-29 20:51:57 +0000 |
| commit | b17796f30a1b9cdde29f5b0e338c482ba447a4b1 (patch) | |
| tree | 7cffc79296fdc22515f88eb23bd25d64fe6a630a /Android.mk | |
| parent | b380f17426f419e3663da80985dc62f544d47048 (diff) | |
| parent | 25668cd6ed661c59295cb65348a126fb245757d4 (diff) | |
| download | android_packages_apps_Gallery2-b17796f30a1b9cdde29f5b0e338c482ba447a4b1.tar.gz android_packages_apps_Gallery2-b17796f30a1b9cdde29f5b0e338c482ba447a4b1.tar.bz2 android_packages_apps_Gallery2-b17796f30a1b9cdde29f5b0e338c482ba447a4b1.zip | |
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index a5efe5500..11c716063 100644 --- a/Android.mk +++ b/Android.mk @@ -11,7 +11,6 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) -LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR += packages/apps/Camera/res @@ -41,10 +40,8 @@ include $(BUILD_PACKAGE) include $(call all-makefiles-under, jni) ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) -# Use the following include to make gallery test apk. -include $(call all-makefiles-under, $(LOCAL_PATH)) -# Use the following include to make camera test apk. -include $(call all-makefiles-under, ../Camera) +# Use the following include to make gallery test apk and the mosaic library +include $(call all-makefiles-under, $(LOCAL_PATH)) endif |