diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 20:57:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 20:57:35 +0000 |
| commit | cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4 (patch) | |
| tree | 27ff31dcd4841d9f627fcf39895fa360418ab28a /media | |
| parent | a8fe14a2116e68b22aa9f5d9aefb27e373dc4074 (diff) | |
| parent | 49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e (diff) | |
| download | frameworks_base-cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4.zip frameworks_base-cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4.tar.gz frameworks_base-cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4.tar.bz2 | |
am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Diffstat (limited to 'media')
| -rw-r--r-- | media/mca/filterfw/Android.mk | 6 | ||||
| -rw-r--r-- | media/mca/filterfw/jni/Android.mk | 7 | ||||
| -rw-r--r-- | media/mca/filterpacks/Android.mk | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk index a63d635..334f4e2 100644 --- a/media/mca/filterfw/Android.mk +++ b/media/mca/filterfw/Android.mk @@ -43,10 +43,4 @@ LOCAL_SHARED_LIBRARIES := \ libjnigraphics \ libmedia -# Don't prelink this library. For more efficient code, you may want -# to add this library to the prelink map and set this to true. However, -# it's difficult to do this for applications that are not supplied as -# part of a system image. -LOCAL_PRELINK_MODULE := false - include $(BUILD_SHARED_LIBRARY) diff --git a/media/mca/filterfw/jni/Android.mk b/media/mca/filterfw/jni/Android.mk index 4ae32ac..cba4e7e 100644 --- a/media/mca/filterfw/jni/Android.mk +++ b/media/mca/filterfw/jni/Android.mk @@ -41,13 +41,6 @@ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ $(LOCAL_PATH)/.. -# Don't prelink this library. For more efficient code, you may want -# to add this library to the prelink map and set this to true. However, -# it's difficult to do this for applications that are not supplied as -# part of a system image. -LOCAL_PRELINK_MODULE := false - LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unused-parameter include $(BUILD_STATIC_LIBRARY) - diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk index 7e8661f..0ff7658 100644 --- a/media/mca/filterpacks/Android.mk +++ b/media/mca/filterpacks/Android.mk @@ -48,8 +48,6 @@ LOCAL_SRC_FILES += native/imageproc/brightness.c \ LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw -LOCAL_PRELINK_MODULE := false - LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code include $(BUILD_SHARED_LIBRARY) |