commit f0ae38e53b240899bd38f1c43c31e72258620723
author Roman Kiryanov <rkir@google.com> Tue May 19 17:25:11 2020 +0000
committer Roman Kiryanov <rkir@google.com> Tue May 19 17:25:11 2020 +0000
tree fbe5f16dc39aa9d55525e7095f4c468f1f8c8bbe
parent 4e97ba42deffa82ed4a875bda085766d79659b64

Revert "Migrate codecs to .bp"

This reverts commit 4e97ba42deffa82ed4a875bda085766d79659b64.

Bug: 157055359
Reason for revert: Broken build on git_qt-qpr1-dev-plus-aosp on build_test

Change-Id: I96c9d467d53aaf1aaa0cbb9231fe2ab92930d5fd

Android.mk

diff --git a/Android.mk b/Android.mk
index c98f182..35757ef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -164,6 +164,11 @@
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 28 -o $(IS_AT_LEAST_QPR1) = true && echo isApi29OrHigher),isApi29OrHigher)
     # HWC2 enabled after P
     include $(GOLDFISH_OPENGL_PATH)/system/hwc2/Android.mk
+    # hardware codecs enabled after P
+    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/common/Android.mk
+    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/plugin/Android.mk
+    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/avcdec/Android.mk
+    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/vpxdec/Android.mk
 endif
 
 endif