summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-11 04:14:36 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-12 01:36:19 (GMT)
commitbb9fad0ad606abf72086e32ff8ed32d7cae8b965 (patch)
tree2dc398de3142afca9f5f48e75d305197d9e8b512
parent150b9dfb7d5f3dea23c4962b95b060e090a0ad2f (diff)
downloadframeworks-bb9fad0ad606abf72086e32ff8ed32d7cae8b965.zip
frameworks-bb9fad0ad606abf72086e32ff8ed32d7cae8b965.tar.gz
frameworks-bb9fad0ad606abf72086e32ff8ed32d7cae8b965.tar.bz2
frameworks: change LOCAL_C_INCLUDES path to relative path [1/6]
PD# 158574 change LOCAL_C_INCLUDES path to relative path Change-Id: I516a88ea1b5e28ddc53e51246ab1f01007e90b9e
Diffstat
-rw-r--r--core/jni/Android.mk4
-rw-r--r--core/jni/hdmi_cec/Android.mk2
-rw-r--r--services/imageplayer/Android.mk4
3 files changed, 4 insertions, 6 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index fa44815..1d64600 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -1,7 +1,5 @@
LOCAL_PATH:= $(call my-dir)
-CURRENT_PATH := $(TOP)/vendor/amlogic/frameworks/core/jni
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -115,4 +113,4 @@ endif
include $(BUILD_SHARED_LIBRARY)
-include $(CURRENT_PATH)/hdmi_cec/Android.mk
+include $(LOCAL_PATH)/hdmi_cec/Android.mk
diff --git a/core/jni/hdmi_cec/Android.mk b/core/jni/hdmi_cec/Android.mk
index 51cd69f..4e9ad5d 100644
--- a/core/jni/hdmi_cec/Android.mk
+++ b/core/jni/hdmi_cec/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
LOCAL_LDLIBS := -lm -llog
-HDMI_CEC_NATIVE_PATH := $(TOP)/vendor/amlogic/frameworks/services/hdmicec
+HDMI_CEC_NATIVE_PATH := $(LOCAL_PATH)/../../../services/hdmicec
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES:= \
diff --git a/services/imageplayer/Android.mk b/services/imageplayer/Android.mk
index e87e06f..70b4124 100644
--- a/services/imageplayer/Android.mk
+++ b/services/imageplayer/Android.mk
@@ -54,8 +54,8 @@ LOCAL_C_INCLUDES += \
external/skia/include/utils \
frameworks/av/include \
frameworks/av \
- vendor/amlogic/frameworks/services/systemcontrol \
- vendor/amlogic/external/libtiff
+ $(LOCAL_PATH)/../systemcontrol \
+ $(LOCAL_PATH)/../../../external/libtiff
LOCAL_MODULE:= imageserver
LOCAL_REQUIRED_MODULES := libtiff