diff options
| author | D. Andrei Măceș <dmaces@nd.edu> | 2016-08-24 12:58:43 -0400 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2018-01-29 19:54:18 +0100 |
| commit | 5de050866dbe5375d8ffbcf81f8770b0b304c0a1 (patch) | |
| tree | ae6bfafe611ffb40dee16b70cfafacae6cf5171d /domx | |
| parent | 615669849b51c74ebefe354eccd47978a94bdf80 (diff) | |
| download | android_hardware_ti_omap4-5de050866dbe5375d8ffbcf81f8770b0b304c0a1.tar.gz android_hardware_ti_omap4-5de050866dbe5375d8ffbcf81f8770b0b304c0a1.tar.bz2 android_hardware_ti_omap4-5de050866dbe5375d8ffbcf81f8770b0b304c0a1.zip | |
board: Localize COMMON_GLOBAL_CFLAGS to respective modules
* -DENHANCED_DOMX already localized, so remove it here
* -DUSE_TI_LIBION was propagated to modules/pvr-source
* -DOMAP_ENHANCEMENT moved to camera & test/CameraHal
* -DOMAP_ENHANCEMENT_BURST_CAPTURE, same as above
* -DOMAP_ENHANCEMENT_S3D moved to camera & hwc
* -DOMAP_ENHANCEMENT_CPCAM to TI_CAMERAHAL_COMMON_CFLAGS
* -DOMAP_ENHANCEMENT_VTC to camera & domx/omx_proxy_component
* -DUSE_ITTIAM_AAC moved to domx/omx_core
* -DOMAP_ENHANCEMENT_MULTIGPU is NOOP
Change-Id: I9b1c70a5201b73c354cbdafe4669620e816d484f
Diffstat (limited to 'domx')
| -rw-r--r-- | domx/domx/Android.mk | 1 | ||||
| -rw-r--r-- | domx/omx_core/Android.mk | 4 | ||||
| -rw-r--r-- | domx/omx_proxy_component/Android.mk | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/domx/domx/Android.mk b/domx/domx/Android.mk index e8b039b..dbd939b 100644 --- a/domx/domx/Android.mk +++ b/domx/domx/Android.mk @@ -40,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ ifeq ($(BOARD_USE_TI_LIBION),true) LOCAL_SHARED_LIBRARIES += libion_ti +LOCAL_CFLAGS += -DUSE_TI_LIBION else LOCAL_SHARED_LIBRARIES += libion LOCAL_SRC_FILES += ../../libion/ion_ti_custom.c diff --git a/domx/omx_core/Android.mk b/domx/omx_core/Android.mk index f35eb2b..3308e79 100644 --- a/domx/omx_core/Android.mk +++ b/domx/omx_core/Android.mk @@ -16,6 +16,10 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libmm_osal +ifdef USE_ITTIAM_AAC +LOCAL_CFLAGS += -DUSE_ITTIAM_AAC +endif + LOCAL_CFLAGS += -DSTATIC_TABLE -D_Android -DCHECK_SECURE_STATE LOCAL_MODULE:= libOMX_Core LOCAL_MODULE_TAGS:= optional diff --git a/domx/omx_proxy_component/Android.mk b/domx/omx_proxy_component/Android.mk index 2dc71ac..00bac1a 100644 --- a/domx/omx_proxy_component/Android.mk +++ b/domx/omx_proxy_component/Android.mk @@ -105,12 +105,17 @@ LOCAL_SHARED_LIBRARIES := \ ifeq ($(BOARD_USE_TI_LIBION),true) LOCAL_SHARED_LIBRARIES += libion_ti +LOCAL_CFLAGS += -DUSE_TI_LIBION else LOCAL_SHARED_LIBRARIES += libion LOCAL_SRC_FILES += ../../libion/ion_ti_custom.c LOCAL_C_INCLUDES += $(HARDWARE_TI_OMAP4_BASE)/libion endif +ifdef OMAP_ENHANCEMENT_VTC +LOCAL_CFLAGS += -DOMAP_ENHANCEMENT_VTC +endif + LOCAL_CFLAGS += -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION |