| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-12-22 08:21:43 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-12-22 08:21:43 (GMT) |
| commit | c3bbd1484d001920e03de6f70abe3ca7af432dea (patch) | |
| tree | ae6c6663e711c2c8e9a0c1454d8625e68e47bfea | |
| parent | ef334de8bf984314d25af288cf2e3f33294301ec (diff) | |
| parent | e9f40bc8593a04bdc3220d170ab6f2b5e2ad06a3 (diff) | |
| download | dvb-c3bbd1484d001920e03de6f70abe3ca7af432dea.zip dvb-c3bbd1484d001920e03de6f70abe3ca7af432dea.tar.gz dvb-c3bbd1484d001920e03de6f70abe3ca7af432dea.tar.bz2 | |
Merge "dvb: change LOCAL_C_INCLUDES path to relative path [15/24]" into tv-arch-next
| -rw-r--r-- | am_adp/Android.mk | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/am_av_test/Android.mk | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/am_dsc_test/Android.mk | 6 | ||||
| -rw-r--r-- | test/am_dvr_test/Android.mk | 18 |
4 files changed, 17 insertions, 17 deletions
diff --git a/am_adp/Android.mk b/am_adp/Android.mk index 37c9c26..128b455 100644 --- a/am_adp/Android.mk +++ b/am_adp/Android.mk @@ -6,8 +6,8 @@ AMADEC_C_INCLUDES:=hardware/amlogic/media/amcodec/include\ hardware/amlogic/LibAudio/amadec/include AMADEC_LIBS:=libamadec else -AMADEC_C_INCLUDES:=vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include +AMADEC_C_INCLUDES:=$(LOCAL_PATH)/../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../frameworks/av/LibPlayer/amadec/include AMADEC_LIBS:=libamplayer endif diff --git a/test/am_av_test/Android.mk b/test/am_av_test/Android.mk index 02ba1f5..7e8bd6f 100755..100644 --- a/test/am_av_test/Android.mk +++ b/test/am_av_test/Android.mk @@ -14,9 +14,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro packages/amlogic/LibPlayer/amcodec/include\ packages/amlogic/LibPlayer/amffmpeg\ packages/amlogic/LibPlayer/amplayer\ - vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/dvbplayer/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/dvbplayer/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amadec/include #LOCAL_STATIC_LIBRARIES := libam_adp LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libdl libc diff --git a/test/am_dsc_test/Android.mk b/test/am_dsc_test/Android.mk index 1962cf3..efc5e3e 100755..100644 --- a/test/am_dsc_test/Android.mk +++ b/test/am_dsc_test/Android.mk @@ -11,9 +11,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro packages/amlogic/LibPlayer/amcodec/include\ packages/amlogic/LibPlayer/amffmpeg\ packages/amlogic/LibPlayer/amplayer\ - vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/dvbplayer/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/dvbplayer/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amadec/include #LOCAL_STATIC_LIBRARIES := libam_adp LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libdl libc diff --git a/test/am_dvr_test/Android.mk b/test/am_dvr_test/Android.mk index 39dbc25..78fbf2e 100644 --- a/test/am_dvr_test/Android.mk +++ b/test/am_dvr_test/Android.mk @@ -10,9 +10,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro packages/amlogic/LibPlayer/amcodec/include\ packages/amlogic/LibPlayer/amffmpeg\ packages/amlogic/LibPlayer/amplayer\ - vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/dvbplayer/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/dvbplayer/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amadec/include #LOCAL_STATIC_LIBRARIES := libam_adp LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl LOCAL_32_BIT_ONLY := true @@ -29,9 +29,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro packages/amlogic/LibPlayer/amcodec/include\ packages/amlogic/LibPlayer/amffmpeg\ packages/amlogic/LibPlayer/amplayer\ - vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/dvbplayer/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/dvbplayer/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amadec/include #LOCAL_STATIC_LIBRARIES := libam_adp LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl LOCAL_32_BIT_ONLY := true @@ -48,9 +48,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro packages/amlogic/LibPlayer/amcodec/include\ packages/amlogic/LibPlayer/amffmpeg\ packages/amlogic/LibPlayer/amplayer\ - vendor/amlogic/frameworks/av/LibPlayer/amcodec/include\ - vendor/amlogic/frameworks/av/LibPlayer/dvbplayer/include\ - vendor/amlogic/frameworks/av/LibPlayer/amadec/include + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amcodec/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/dvbplayer/include\ + $(LOCAL_PATH)/../../../frameworks/av/LibPlayer/amadec/include #LOCAL_STATIC_LIBRARIES := libam_adp LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl LOCAL_32_BIT_ONLY := true |