| author | Tellen Yu <tellen.yu@amlogic.com> | 2015-10-23 06:16:55 (GMT) |
|---|---|---|
| committer | Tellen Yu <tellen.yu@amlogic.com> | 2015-10-26 08:58:24 (GMT) |
| commit | f289039f9abdd24b648031c9a502ba9590617299 (patch) | |
| tree | 282a9ad1b409ebc2f3ac0f54ad8e848813cd1dbf | |
| parent | 5e4886603692a84b418242d7f1cce4399342b2df (diff) | |
| download | pppoe-f289039f9abdd24b648031c9a502ba9590617299.zip pppoe-f289039f9abdd24b648031c9a502ba9590617299.tar.gz pppoe-f289039f9abdd24b648031c9a502ba9590617299.tar.bz2 | |
modify for compile error
Change-Id: Ie54864e99688870a51bf112630c651e1955d5a66
| -rwxr-xr-x | Android.mk | 86 | ||||
| -rw-r--r-- | jni/src/netwrapper.c | 4 |
2 files changed, 2 insertions, 88 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100755 index af64a85..0000000 --- a/Android.mk +++ b/dev/null @@ -1,86 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -PPPOE_VERSION="\"3.0\"" - -#MAKE_JAR -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JNI_SHARED_LIBRARIES := libpppoejni -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := droidlogic.external.pppoe -include $(BUILD_JAVA_LIBRARY) - -#MAKE_XML -include $(CLEAR_VARS) -LOCAL_MODULE := droidlogic.external.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) - - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := jni/src/pppoe.c \ - jni/src/if.c \ - jni/src/debug.c \ - jni/src/common.c \ - jni/src/ppp.c \ - jni/src/discovery.c \ - jni/src/netwrapper.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) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= jni/src/pppoe_status.c \ - jni/pppoe_jni.cpp \ - jni/src/netwrapper.c - - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - liblog \ - libselinux - - -LOCAL_SHARED_LIBRARIES += libandroid_runtime libnativehelper -LOCAL_SHARED_LIBRARIES += libc libcutils libnetutils -LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH)/jni/src -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/common.c \ - jni/src/netwrapper.c - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := pcli -LOCAL_SHARED_LIBRARIES := libcutils libnetutils libselinux -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= jni/src/pppoe_wrapper.c \ - jni/src/common.c \ - jni/src/netwrapper.c - -LOCAL_SHARED_LIBRARIES := \ - libcutils libcrypto libnetutils libselinux - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include - -LOCAL_CFLAGS := -DANDROID_CHANGES - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= pppoe_wrapper - -include $(BUILD_EXECUTABLE) - diff --git a/jni/src/netwrapper.c b/jni/src/netwrapper.c index 1d73181..8726d8a 100644 --- a/jni/src/netwrapper.c +++ b/jni/src/netwrapper.c @@ -45,8 +45,8 @@ #include <android/log.h> #include "netwrapper.h" -#include "../../../../../system/core/init/init.h" -#include "../../../../../system/core/init/util.h" +#include "init.h" +#include "util.h" #define LOCAL_TAG "NETWRAPPER" |