From 020e999696d5fc4daff3d193b5065738a072442c Mon Sep 17 00:00:00 2001
From: Chaomin Zheng<chaomin.zheng@amlogic.com>
Date: Mon, 14  Aug  2017  11:13:56  +0000
Subject: PPPoE:intergrate pppoe modules[1/5]

PD# 146472

pppoe add liblog shared library

Change-Id: If8a5ac6d6e53cd6e7a46d701e646e1e9c0261bec
---
diff --git a/Android.mk b/Android.mk
index 47f43f6..539099e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ include $(BUILD_JAVA_LIBRARY)
 
 #MAKE_XML
 include $(CLEAR_VARS)
-LOCAL_MODULE := droidlogic.external.pppoe.xml
+LOCAL_MODULE := droidlogic.software.pppoe.xml
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 
@@ -44,7 +44,7 @@ LOCAL_SRC_FILES := jni/src/pppoe.c \
 #LOCAL_C_INCLUDES += external/selinux/libselinux/include/ \
                     external/selinux/libselinux/src
 
-LOCAL_SHARED_LIBRARIES := libcutils libselinux
+LOCAL_SHARED_LIBRARIES := liblog libcutils libselinux
 LOCAL_MODULE = pppoe
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -DVERSION=$(PPPOE_VERSION)
@@ -93,7 +93,7 @@ LOCAL_SRC_FILES:= jni/src/pppoe_cli.c \
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := pcli
-LOCAL_SHARED_LIBRARIES := libcutils libnetutils libselinux
+LOCAL_SHARED_LIBRARIES := liblog libcutils libnetutils libselinux
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
 LOCAL_PROPRIETARY_MODULE := true
@@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= jni/src/pppoe_wrapper.c \
         jni/src/netwrapper.c
 
 LOCAL_SHARED_LIBRARIES := \
-        libcutils libcrypto libnetutils libselinux
+        liblog libcutils libcrypto libnetutils libselinux
 
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/include
diff --git a/droidlogic.external.pppoe.xml b/droidlogic.external.pppoe.xml
deleted file mode 100644
index 99b664d..0000000
--- a/droidlogic.external.pppoe.xml
+++ b/dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<permissions>
-<library
-name="AmlogicPPPoE"
-file="/system/framework/droidlogic.external.pppoe.jar"
-/>
-</permissions>
-
diff --git a/droidlogic.software.pppoe.xml b/droidlogic.software.pppoe.xml
new file mode 100644
index 0000000..40422d0
--- a/dev/null
+++ b/droidlogic.software.pppoe.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="droidlogic.external.pppoe"
+            file="/vendor/framework/droidlogic.external.pppoe.jar" />
+    <library name="droidlogic.frameworks.pppoe"
+            file="/vendor/framework/droidlogic.frameworks.pppoe.jar" />
+</permissions>
+
--
cgit