commit ba40190c5e8d9bfe5b814984c6861809fea064bd
author Pawin Vongmasa <pawin@google.com> Thu Nov 16 15:38:46 2017 -0800
committer Pawin Vongmasa <pawin@google.com> Thu Nov 16 23:57:36 2017 +0000
tree f935c1e123522e1624163278a8b8564c71c9a394
parent 77a5b891eb2c64246c82d695aac40c5312f0ff3e

Revert "Revert "Revert "Remove unused modules made for non-Treble OMX"""

This reverts commit 620e4667dc41e17e365615fda4507fa9f7267ca0, which was
made originally for b/67990472.

Bug: 69110957

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 9348ecd..faeb0a7 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -1,11 +1,28 @@
 LOCAL_PATH := $(call my-dir)
 
+# service library
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := MediaCodecService.cpp
+LOCAL_SHARED_LIBRARIES := \
+    libmedia_omx \
+    libbinder \
+    libgui \
+    libutils \
+    liblog \
+    libstagefright_omx \
+    libstagefright_xmlparser
+LOCAL_MODULE:= libmediacodecservice
+LOCAL_VENDOR_MODULE := true
+LOCAL_32_BIT_ONLY := true
+include $(BUILD_SHARED_LIBRARY)
+
 # service executable
 include $(CLEAR_VARS)
 LOCAL_REQUIRED_MODULES_arm := mediacodec.policy
 LOCAL_SRC_FILES := main_codecservice.cpp
 LOCAL_SHARED_LIBRARIES := \
     libmedia_omx \
+    libmediacodecservice \
     libbinder \
     libutils \
     libgui \
@@ -25,11 +42,6 @@
 LOCAL_VENDOR_MODULE := true
 LOCAL_32_BIT_ONLY := true
 LOCAL_INIT_RC := android.hardware.media.omx@1.0-service.rc
-
-ifeq ($(PRODUCT_FULL_TREBLE),true)
-LOCAL_CFLAGS += -DUSE_VNDBINDER
-endif
-
 include $(BUILD_EXECUTABLE)
 
 # service seccomp policy