| -rwxr-xr-x | Android.mk | 34 | ||||
| -rwxr-xr-x | jni/pstart | 2 | ||||
| -rwxr-xr-x | jni/pstop | 2 | ||||
| -rwxr-xr-x | jni/src/pppoe.c | 1 | ||||
| -rwxr-xr-x | jni/src/pppoe_cli.c | 12 | ||||
| -rwxr-xr-x | jni/src/pppoe_ctrl.h | 4 | ||||
| -rw-r--r-- | pppoe.xml | 8 |
7 files changed, 32 insertions, 31 deletions
@@ -5,15 +5,16 @@ PPPOE_VERSION="\"3.0\"" #MAKE_JAR include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) -#LOCAL_JNI_SHARED_LIBRARIES := libpppoejni -LOCAL_MODULE := pppoe +LOCAL_JNI_SHARED_LIBRARIES := libpppoejni +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := amlogic.pppoe include $(BUILD_JAVA_LIBRARY) #MAKE_XML include $(CLEAR_VARS) -LOCAL_MODULE := pppoe.xml -#LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := amlogic.pppoe.xml +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -29,6 +30,7 @@ LOCAL_SRC_FILES := jni/src/pppoe.c \ LOCAL_C_INCLUDES := $(KERNEL_HEADERS) LOCAL_SHARED_LIBRARIES := libcutils LOCAL_MODULE = pppoe +LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := -DVERSION=$(PPPOE_VERSION) include $(BUILD_EXECUTABLE) @@ -40,22 +42,21 @@ LOCAL_SRC_FILES:= jni/src/pppoe_ctrl.c\ LOCAL_SHARED_LIBRARIES := libandroid_runtime libnativehelper LOCAL_SHARED_LIBRARIES += libc libcutils LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH)/jni/src - -LOCAL_MODULE := libpppoejni LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libpppoejni LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) -#include $(CLEAR_VARS) -#LOCAL_SRC_FILES:= jni/src/pppoe_cli.c\ -# jni/src/pppoe_ctrl.c -# -#LOCAL_MODULE := pcli -#LOCAL_CFLAGS += -O2 -#LOCAL_LDLIBS += -llog -#LOCAL_SHARED_LIBRARIES := libcutils -#include $(BUILD_EXECUTABLE) +include $(CLEAR_VARS) +LOCAL_SRC_FILES:= jni/src/pppoe_cli.c\ + jni/src/pppoe_ctrl.c +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := pcli +LOCAL_CFLAGS += -O2 +LOCAL_LDLIBS += -llog +LOCAL_SHARED_LIBRARIES := libcutils +include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -69,6 +70,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := -DANDROID_CHANGES +LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= pppoe_wrapper include $(BUILD_EXECUTABLE) |