Skip to content

Commit 06f9928

Browse files
committed
Android build cmake in gradle
1 parent df5e7df commit 06f9928

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

extension/android/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,5 @@ target_include_directories(
192192
target_compile_options(executorch_jni PUBLIC ${_common_compile_options})
193193

194194
target_link_libraries(executorch_jni ${link_libraries} log)
195+
196+
set_target_properties(executorch_jni PROPERTIES OUTPUT_NAME executorch)

extension/android/executorch_android/build.gradle

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,35 @@ android {
2020
minSdk = 23
2121

2222
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
23-
}
2423

25-
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_1_8
27-
targetCompatibility = JavaVersion.VERSION_1_8
28-
}
24+
externalNativeBuild {
25+
cmake {
26+
abiFilters "arm64-v8a"
27+
targets "executorch_jni"
28+
arguments "-DBUILD_TESTING=OFF", "-DCMAKE_INSTALL_PREFIX=/Users/hsz/executorch/cmake-out-android-arm64-v8a", "-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH"
29+
}
30+
}
31+
32+
compileOptions {
33+
sourceCompatibility = JavaVersion.VERSION_1_8
34+
targetCompatibility = JavaVersion.VERSION_1_8
35+
}
2936

30-
sourceSets {
31-
main {
32-
jniLibs.srcDirs = ['../../../cmake-out-android-so/']
37+
sourceSets {
38+
androidTest {
39+
resources.srcDirs += ['src/androidTest/resources']
40+
}
3341
}
34-
androidTest {
35-
resources.srcDirs += [ 'src/androidTest/resources' ]
42+
43+
kotlinOptions {
44+
jvmTarget = "1.8"
3645
}
3746
}
38-
kotlinOptions {
39-
jvmTarget = "1.8"
47+
48+
externalNativeBuild {
49+
cmake {
50+
path "../CMakeLists.txt"
51+
}
4052
}
4153
}
4254

0 commit comments

Comments
 (0)