summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-12-16 21:49:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 21:49:52 +0000
commitb6e899dac06a1b1f951d39f14fb7c21e3de01202 (patch)
tree886c019503b2c576f9d1eda6dbcd049381b1072d
parent16f007f59e9926c722d439ecd84438d6bbfe143e (diff)
parent71933e26e947164e542ed4b5b2a80846633fd9fb (diff)
downloadandroid_frameworks_wilhelm-b6e899dac06a1b1f951d39f14fb7c21e3de01202.tar.gz
android_frameworks_wilhelm-b6e899dac06a1b1f951d39f14fb7c21e3de01202.tar.bz2
android_frameworks_wilhelm-b6e899dac06a1b1f951d39f14fb7c21e3de01202.zip
am 71933e26: am b73cd339: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '71933e26e947164e542ed4b5b2a80846633fd9fb': Cleanup Obsolete LOCAL_PRELINK_MODULE.
-rw-r--r--src/Android.mk3
-rw-r--r--tests/native-media/jni/Android.mk1
2 files changed, 0 insertions, 4 deletions
diff --git a/src/Android.mk b/src/Android.mk
index fe244a3..6228f89 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -197,7 +197,6 @@ ifeq ($(TARGET_BUILD_VARIANT),userdebug)
LOCAL_CFLAGS += -DUSERDEBUG_BUILD=1
endif
-LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
@@ -208,7 +207,6 @@ LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright/include \
frameworks/native/include/media/openmax
LOCAL_MODULE := libOpenSLES
-LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -x c++ -std=gnu++11 -DLI_API= -fvisibility=hidden -UNDEBUG \
-DSL_API='__attribute__((visibility("default")))'
@@ -223,7 +221,6 @@ LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright/include \
frameworks/native/include/media/openmax
LOCAL_MODULE := libOpenMAXAL
-LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -x c++ -std=gnu++11 -DLI_API= -fvisibility=hidden -UNDEBUG \
-DXA_API='__attribute__((visibility("default")))'
diff --git a/tests/native-media/jni/Android.mk b/tests/native-media/jni/Android.mk
index 83b86a0..c883de2 100644
--- a/tests/native-media/jni/Android.mk
+++ b/tests/native-media/jni/Android.mk
@@ -8,7 +8,6 @@ LOCAL_SRC_FILES := native-media-jni.c
LOCAL_CFLAGS += -I$(call include-path-for, wilhelm)
LOCAL_CFLAGS += -UNDEBUG
-LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libutils liblog libOpenMAXAL libandroid