From 43ec6facaec9fdfa7b29ea3cce114e94af95c34c Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Tue, 6 Aug 2013 16:44:42 -0700 Subject: Add .mk files for Camera2. Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f --- Android.mk | 27 ++++++++++++++++++ CleanSpec.mk | 50 +++++++++++++++++++++++++++++++++ gallerycommon/Android.mk | 27 ++++++++++++++++++ proguard.flags | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 177 insertions(+) create mode 100644 Android.mk create mode 100644 CleanSpec.mk create mode 100644 gallerycommon/Android.mk create mode 100644 proguard.flags diff --git a/Android.mk b/Android.mk new file mode 100644 index 000000000..a77ae822e --- /dev/null +++ b/Android.mk @@ -0,0 +1,27 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 +LOCAL_STATIC_JAVA_LIBRARIES += com.android.camera.common +LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit + + +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) + +LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res + +LOCAL_AAPT_FLAGS := --auto-add-overlay + +LOCAL_PACKAGE_NAME := Camera2 + +LOCAL_SDK_VERSION := current + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under, $(LOCAL_PATH)) \ No newline at end of file diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 000000000..dd945b09c --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,50 @@ +# Copyright (C) 2007 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk new file mode 100644 index 000000000..1be5f5485 --- /dev/null +++ b/gallerycommon/Android.mk @@ -0,0 +1,27 @@ +# Copyright 2011, The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +# Build the com.android.emailcommon static library. At the moment, this includes +# the emailcommon files themselves plus everything under src/org (apache code). All of our +# AIDL files are also compiled into the static library + +include $(CLEAR_VARS) + +LOCAL_MODULE := com.android.camera.common +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SDK_VERSION := 16 + +include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 000000000..39e43cbae --- /dev/null +++ b/proguard.flags @@ -0,0 +1,73 @@ +# Disable the warnings of using dynamic method call in common library. +-dontnote com.android.gallery3d.common.* + +# Keep all classes extended from com.android.gallery3d.common.Entry +# Since we annotate on the fields and use reflection to create SQL +# according to those field. + +-keep class * extends com.android.gallery3d.common.Entry { + @com.android.gallery3d.common.Entry$Column ; +} + +# ctors of subclasses of CameraPreference are called with Java reflection. +-keep class * extends com.android.camera.CameraPreference { + (...); +} + +-keep class com.android.camera.CameraActivity { + public boolean isRecording(); + public long getAutoFocusTime(); + public long getShutterLag(); + public long getShutterToPictureDisplayedTime(); + public long getPictureDisplayedToJpegCallbackTime(); + public long getJpegCallbackFinishTime(); + public long getCaptureStartTime(); +} + +-keep class com.android.camera.VideoModule { + public void onCancelBgTraining(...); + public void onProtectiveCurtainClick(...); +} + +-keep class * extends android.app.Activity { + @com.android.camera.OnClickAttr ; +} + +-keep class com.android.camera.CameraHolder { + public static void injectMockCamera(...); +} + +# Disable the warnings of using dynamic method calls in EffectsRecorder +-dontnote com.android.camera.EffectsRecorder + +-keep class android.support.v8.renderscript.** { *; } + + +# For unit testing: + +# - Required for running exif tests on userdebug +-keep class com.android.gallery3d.exif.ExifTag { *; } +-keep class com.android.gallery3d.exif.ExifData { *; } +-keep class com.android.gallery3d.exif.ExifInterface { *; } +-keepclassmembers class com.android.gallery3d.exif.Util { + *** closeSilently(...); +} + +# - Required for running blobcache tests on userdebug +-keep class com.android.gallery3d.common.BlobCache { *; } + +# - Required for running glcanvas tests on userdebug +-keep class com.android.gallery3d.ui.GLPaint { *; } +-keep class com.android.gallery3d.ui.GLCanvas { *; } +-keep class com.android.gallery3d.glrenderer.GLPaint { *; } +-keep class com.android.gallery3d.glrenderer.GLCanvas { *; } +-keep class com.android.gallery3d.ui.GLView { *; } +-keepclassmembers class com.android.gallery3d.util.IntArray { + *** toArray(...); +} +-keep class com.android.gallery3d.util.ProfileData { *; } + +# - Required for running jpeg stream tests on userdebug +-keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; } +-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; } +-keep class com.android.gallery3d.jpegstream.StreamUtils { *; } -- cgit v1.2.3