Skip to content

Commit fd051f3

Browse files
author
Dmitry Tretyakov
committed
chore(ovkmplayer): restored media player building abillity
1 parent 40f86ca commit fd051f3

6 files changed

Lines changed: 34 additions & 27 deletions

File tree

‎app/build.gradle‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
import org.apache.tools.ant.taskdefs.condition.Os
23

34
def getGitHubCommit = {
45
try {
@@ -86,10 +87,16 @@ android {
8687
release {
8788
buildConfigField "String", "GITHUB_COMMIT", "\"${getGitHubCommit()}\""
8889
buildConfigField "String", "SOURCE_CODE", "\"https://github.com/openvk/mobile-android-legacy\""
90+
ndk {
91+
abiFilters 'x86', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
92+
}
8993
}
9094
debug {
9195
buildConfigField "String", "GITHUB_COMMIT", "\"${getGitHubCommit()}\""
9296
buildConfigField "String", "SOURCE_CODE", "\"https://github.com/openvk/mobile-android-legacy\""
97+
ndk {
98+
abiFilters 'x86', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
99+
}
93100
}
94101
}
95102
productFlavors {
@@ -130,6 +137,33 @@ android {
130137
sourceCompatibility JavaVersion.VERSION_1_7
131138
targetCompatibility JavaVersion.VERSION_1_7
132139
}
140+
task mPlayerBuild(type: Exec, description: 'Compile OpenVK Media Player via NDK') {
141+
def ndkDir = android.ndkDirectory
142+
def projDir = project.projectDir.toString()
143+
println "Compiling OpenVK Media Player..."
144+
println "Project Directory: ${projDir}"
145+
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
146+
commandLine "$ndkDir\\ndk-build.cmd",
147+
"NDK_PROJECT_PATH=$projDir/app/src/main",
148+
"NDK_LIBS_OUT=$projDir/app/src/main/jniLibs",
149+
"APP_BUILD_SCRIPT=$projDir/../ndk-modules/ovkmplayer/Android.mk",
150+
"NDK_APPLICATION_MK=$projDir/../ndk-modules/ovkmplayer/Application.mk"
151+
} else {
152+
commandLine "$ndkDir/ndk-build.sh",
153+
"NDK_PROJECT_PATH=$projDir/app/src/main",
154+
"NDK_LIBS_OUT=$projDir/app/src/main/jniLibs",
155+
"APP_BUILD_SCRIPT=$projDir/ndk-modules/ovkmplayer/Android.mk",
156+
"NDK_APPLICATION_MK=$projDir/ndk-modules/ovkmplayer/Application.mk"
157+
}
158+
}
159+
tasks.withType(JavaCompile) {
160+
compileTask -> compileTask.dependsOn mPlayerBuild
161+
}
162+
externalNativeBuild {
163+
ndkBuild {
164+
path '../ndk-modules/ovkmplayer/Android.mk'
165+
}
166+
}
133167
}
134168

135169
dependencies {

‎modules/actionbar/actionbar.iml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,15 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7979
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8180
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8482
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9187
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9388
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9589
</content>
9690
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9791
<orderEntry type="sourceFolder" forTests="false" />

‎modules/ovk-api/ovk-api.iml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,13 @@
7979
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9288
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9489
</content>
9590
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9691
<orderEntry type="sourceFolder" forTests="false" />

‎modules/popupmenu/popupmenu.iml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,12 @@
7676
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7777
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8079
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8481
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8884
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9085
</content>
9186
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9287
<orderEntry type="sourceFolder" forTests="false" />

‎modules/twemojicon/twemojicon.iml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,15 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7979
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8180
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8482
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9187
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9388
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9589
</content>
9690
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9791
<orderEntry type="sourceFolder" forTests="false" />

‎modules/wrhttp/wrhttp.iml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,12 @@
7878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7979
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9086
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9287
</content>
9388
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9489
<orderEntry type="sourceFolder" forTests="false" />

0 commit comments

Comments
 (0)