From 5fa64ee06b131fbe0ff45edf12ef3e7d579e415a Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Thu, 7 Nov 2024 19:40:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=AF=91=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZLMediaKit/CMakeLists.txt       | 2 --
 app/build.gradle                | 3 ++-
 app/src/main/cpp/CMakeLists.txt | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ZLMediaKit/CMakeLists.txt b/ZLMediaKit/CMakeLists.txt
index d144eee..37f277d 100644
--- a/ZLMediaKit/CMakeLists.txt
+++ b/ZLMediaKit/CMakeLists.txt
@@ -33,8 +33,6 @@ project(ZLMediaKit LANGUAGES C CXX)
 # Enable C++11
 set(CMAKE_CXX_STANDARD 11)
 
-add_definitions(-DENABLE_HLS=1)
-
 option(ENABLE_API "Enable C API SDK" ON)
 option(ENABLE_API_STATIC_LIB "Enable mk_api static lib" OFF)
 option(ENABLE_ASAN "Enable Address Sanitize" OFF)
diff --git a/app/build.gradle b/app/build.gradle
index 77bce4b..7ad4bc4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -frtti -fexceptions"
-                arguments "-DENABLE_API=on", "-DENABLE_API_STATIC_LIB=on", "-DENABLE_TESTS=off", "-DENABLE_PLAYER=off", "-DENABLE_SERVER_LIB=on"
+                arguments "-DENABLE_API=on", "-DENABLE_API_STATIC_LIB=on", "-DENABLE_TESTS=off", "-DENABLE_HLS=on", "-DENABLE_PLAYER=off", "-DENABLE_SERVER_LIB=on"
             }
         }
     }
@@ -67,6 +67,7 @@ android {
         exclude 'META-INF/LICENSE.md'
 
     }
+    ndkVersion '25.2.9519653'
 
 }
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index e55cca5..6080adf 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -11,6 +11,8 @@ project("mprmt")
 
 set(CMAKE_CXX_STANDARD 11)
 
+add_definitions(-DENABLE_HLS=1)
+
 #设置生成的so动态库最后输出的路径
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libs_export/${ANDROID_ABI})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libs_export/${ANDROID_ABI})