ref: fe17cd5a13fbcb9f2c5e8bc3cab6a14eb1b34e71
parent: 0b74eee631dab390d0287391eb8c4a34b4df2e73
author: Martin Storsjö <[email protected]>
date: Wed Feb 19 17:07:22 EST 2014
Remove unnecessary commented out code in the android makefiles Comments isn't a place to store code snippets that might (or might not) be useful later.
--- a/codec/build/android/dec/jni/Application.mk
+++ b/codec/build/android/dec/jni/Application.mk
@@ -17,5 +17,4 @@
endif
APP_STL := stlport_shared
-#APP_STL := gnustl_shared
APP_PLATFORM := android-12
--- a/codec/build/android/dec/jni/welsdecdemo.mk
+++ b/codec/build/android/dec/jni/welsdecdemo.mk
@@ -1,12 +1,6 @@
# Generate the libwelsdecdemo.so file
LOCAL_PATH := $(call my-dir)
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := stlport
-#LOCAL_SRC_FILES := $(NDK_ROOT)/sources/cxx-stl/stlport/libs/$(TARGET_ARCH_ABI)/libstlport_static.a
-#LOCAL_EXPORT_C_INCLUDES := $(NDK_ROOT)/sources/cxx-stl/stlport/stlport
-#include $(PREBUILT_STATIC_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_MODULE := wels
LOCAL_SRC_FILES := $(LOCAL_PATH)/../../../../../libwels.so
@@ -48,9 +42,7 @@
LOCAL_ARM_MODE := arm
endif
-#LOCAL_STATIC_LIBRARIES += stlport
LOCAL_LDLIBS := -llog
-#LOCAL_LDLIBS += -L../../../ -lwels
LOCAL_SHARED_LIBRARIES := wels
include $(BUILD_SHARED_LIBRARY)
--- a/codec/build/android/enc/jni/Application.mk
+++ b/codec/build/android/enc/jni/Application.mk
@@ -17,5 +17,4 @@
endif
APP_STL := stlport_shared
-#APP_STL := gnustl_shared
APP_PLATFORM := android-12
--- a/codec/build/android/enc/jni/welsencdemo.mk
+++ b/codec/build/android/enc/jni/welsencdemo.mk
@@ -1,12 +1,6 @@
# Generate the libwelsdecdemo.so file
LOCAL_PATH := $(call my-dir)
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := stlport
-#LOCAL_SRC_FILES := $(NDK_ROOT)/sources/cxx-stl/stlport/libs/$(TARGET_ARCH_ABI)/libstlport_static.a
-#LOCAL_EXPORT_C_INCLUDES := $(NDK_ROOT)/sources/cxx-stl/stlport/stlport
-#include $(PREBUILT_STATIC_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_MODULE := wels
LOCAL_SRC_FILES := $(LOCAL_PATH)/../../../../../libwels.so
@@ -52,9 +46,7 @@
LOCAL_ARM_MODE := arm
endif
-#LOCAL_STATIC_LIBRARIES += stlport
LOCAL_LDLIBS := -llog
-#LOCAL_LDLIBS += -L../../../ -lwels
LOCAL_SHARED_LIBRARIES := wels
include $(BUILD_SHARED_LIBRARY)