summaryrefslogtreecommitdiffstats
path: root/nci
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-12-16 20:49:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 20:49:46 +0000
commit7a4fb2ad7cf1ae3360e90707531be115d854c4e9 (patch)
tree1002e5dc677fd59d559eab25b962c26d7b5b6167 /nci
parent5c2e5e72cf0f5d3f53f6062735511ade5d2698d8 (diff)
parentf30e2ed4a9aa9801504c786c8ae515b88bf1d79e (diff)
downloadandroid_packages_apps_Nfc-7a4fb2ad7cf1ae3360e90707531be115d854c4e9.tar.gz
android_packages_apps_Nfc-7a4fb2ad7cf1ae3360e90707531be115d854c4e9.tar.bz2
android_packages_apps_Nfc-7a4fb2ad7cf1ae3360e90707531be115d854c4e9.zip
am f30e2ed4: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit 'f30e2ed4a9aa9801504c786c8ae515b88bf1d79e': Cleanup Obsolete LOCAL_PRELINK_MODULE.
Diffstat (limited to 'nci')
-rw-r--r--nci/jni/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk
index f220a6d3..241e333c 100644
--- a/nci/jni/Android.mk
+++ b/nci/jni/Android.mk
@@ -6,7 +6,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_PRELINK_MODULE := false
ifneq ($(NCI_VERSION),)
LOCAL_CFLAGS += -DNCI_VERSION=$(NCI_VERSION) -O0 -g