3 files changed, 28 insertions, 30 deletions
diff --git a/libstagefright/Android.mk b/libstagefright/Android.mk--
index 5053e7d..5053e7d 100644
--- a/libstagefright/Android.mk
+++ b/libstagefright/Android.mk--
diff --git a/mediaextconfig/Android.bp b/mediaextconfig/Android.bp
new file mode 100644
index 0000000..dcf7499
--- a/dev/null
+++ b/mediaextconfig/Android.bp
@@ -0,0 +1,28 @@
+cc_library_static {
+    name: "libregistermsext_aml",
+    srcs: [
+	"register.cpp",
+	"AmSharedLibrary.cpp",
+	"AmLoadAmlogicPlayers.cpp",
+	"AmSupportModules.cpp"
+    ],
+
+    cflags: [
+        "-Werror",
+        "-Wall",
+    ],
+
+    shared_libs: [
+        "libbinder",
+        "libcutils",
+        "libdl",
+        "libutils",
+        "liblog",
+    ],
+
+    include_dirs: [
+        "frameworks/av/media/libstagefright/include",
+        "vendor/amlogic/common/frameworks/av/mediaextconfig/include",
+    ],
+}
+
diff --git a/mediaextconfig/Android.mk b/mediaextconfig/Android.mk
deleted file mode 100644
index 1a19cfa..0000000
--- a/mediaextconfig/Android.mk
+++ b/dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-ifeq ($(BOARD_USE_CUSTOM_MEDIASERVEREXTENSIONS),true)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
-	register.cpp \
-	AmSharedLibrary.cpp\
-	AmLoadAmlogicPlayers.cpp\
-	AmSupportModules.cpp\
-
-
-LOCAL_SHARED_LIBRARIES := \
-        libbinder \
-        libcutils \
-        libdl \
-        libutils \
-        liblog \
-
-
-LOCAL_C_INCLUDES+= \
-	$(TOP)/frameworks/av/media/libstagefright/include  \
-	$(LOCAL_PATH)/include/
-
-LOCAL_MODULE := libregistermsext
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -Werror -Wall
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-