diff options
| author | Sasha Smundak <asmundak@google.com> | 2021-10-06 09:31:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-06 09:31:08 +0000 |
| commit | f6c3c751c10fd1bf439aea0b8a9bddc0f177ce4b (patch) | |
| tree | 98d635e62c3932a66fe77293c8906a7f2570ee5c | |
| parent | c2586558e1e7cdeb5e71384ca911c4af6dff3dba (diff) | |
| parent | ee833abf4fd8a9bb3f51d837df677ae5b6a4e699 (diff) | |
| download | media-f6c3c751c10fd1bf439aea0b8a9bddc0f177ce4b.tar.gz | |
Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx. am: 2decbcf680 am: c196d22c21 am: ee833abf4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15975244
Change-Id: Ie0f42e6559f60a487bf6092fc759c7deeea8ffb8
| -rw-r--r-- | mm-core/Android.mk | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mm-core/Android.mk b/mm-core/Android.mk index 37a4b2e3..6dc01ab9 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -24,7 +24,7 @@ else OMXCORE_CFLAGS += -D_DEFAULT_ endif -ifeq ($(call is-platform-sdk-version-at-least,27),true) # O-MR1 +ifdef IS_AT_LEAST_OPM1 # O-MR1 OMXCORE_CFLAGS += -D_ANDROID_O_MR1_DIVX_CHANGES endif diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 00344967..d7b37b65 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -51,7 +51,7 @@ ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)),true) libmm-vdec-def += -DMASTER_SIDE_CP endif -ifeq ($(call is-platform-sdk-version-at-least,27),true) # O-MR1 +ifdef IS_AT_LEAST_OPM1 # O-MR1 libmm-vdec-def += -D_ANDROID_O_MR1_DIVX_CHANGES endif @@ -78,12 +78,12 @@ endif # Common Dependencies libmm-vdec-add-dep := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifeq ($(call is-platform-sdk-version-at-least, 19),true) +ifeq (T,T) # TODO: Obsolete, please remove # This feature is enabled for Android KK+ libmm-vdec-def += -DADAPTIVE_PLAYBACK_SUPPORTED endif -ifeq ($(call is-platform-sdk-version-at-least, 22),true) +ifeq (T,T) # TODO: Obsolete, please remove # This feature is enabled for Android LMR1 libmm-vdec-def += -DFLEXYUV_SUPPORTED endif |