aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-30 19:44:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-30 19:44:46 +0000
commitbca5932019d2be9a70437694cd2dad372b8a4c08 (patch)
tree5f0a712a0bd439ebc9bf683be7f12b134a1a2d9b
parent83bb139c4c3875f924586a5228603fc5546c05d3 (diff)
parent1720265c3beeebcde06f30f5b37d47011a694a73 (diff)
downloadandroid_libnativehelper-bca5932019d2be9a70437694cd2dad372b8a4c08.tar.gz
android_libnativehelper-bca5932019d2be9a70437694cd2dad372b8a4c08.tar.bz2
android_libnativehelper-bca5932019d2be9a70437694cd2dad372b8a4c08.zip
am 1720265c: am b37e11d0: Merge "libnativehelper: Remove an unused NDK-only target"
* commit '1720265c3beeebcde06f30f5b37d47011a694a73': libnativehelper: Remove an unused NDK-only target
-rw-r--r--Android.mk19
1 files changed, 0 insertions, 19 deletions
diff --git a/Android.mk b/Android.mk
index fec5a0a..29b851d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,25 +38,6 @@ LOCAL_SHARED_LIBRARIES += libcutils libstlport libdl
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
-# NDK-only build for the target (device).
-# - Relies only on NDK exposed functionality.
-# - This doesn't include JniInvocation.
-#
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libnativehelper_compat
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include/nativehelper
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(LOCAL_PATH)/include/nativehelper
-LOCAL_CFLAGS := -Werror
-LOCAL_SRC_FILES := $(local_src_files)
-LOCAL_LDFLAGS := -llog
-LOCAL_SDK_VERSION := 19
-LOCAL_NDK_STL_VARIANT := stlport_static
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_SHARED_LIBRARY)
#
# NDK-only build for the target (device), using libc++.