Skip to content

Commit eebd9d5

Browse files
TLabAltohTLabAltoh
committed
support GeckoView
1 parent bfc47a4 commit eebd9d5

File tree

99 files changed

+6760
-3616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+6760
-3616
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,2 @@
1-
# Project-wide Gradle settings.
2-
# IDE (e.g. Android Studio) users:
3-
# Gradle settings configured through the IDE *will override*
4-
# any settings specified in this file.
5-
# For more details on how to configure your build environment visit
6-
# http://www.gradle.org/docs/current/userguide/build_environment.html
7-
# Specifies the JVM arguments used for the daemon process.
8-
# The setting is particularly useful for tweaking memory settings.
91
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
10-
# When configured, Gradle will run in incubating parallel mode.
11-
# This option should only be used with decoupled projects. More details, visit
12-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13-
# org.gradle.parallel=true
14-
# AndroidX package structure to make it clearer which packages are bundled with the
15-
# Android operating system, and which are packaged with your app's APK
16-
# https://developer.android.com/topic/libraries/support-library/androidx-rn
17-
android.useAndroidX=true
18-
# Enables namespacing of each library's R class so that its R class includes only the
19-
# resources declared in the library itself and none from the library's dependencies,
20-
# thereby reducing the size of the R class for that library
21-
android.nonTransitiveRClass=true
2+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 10 00:04:30 JST 2023
1+
#Fri Nov 08 03:38:14 JST 2024
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

libwebview/build.gradle renamed to libTLabWebView/build.gradle

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
android {
6-
namespace "com.tlab.libwebview"
6+
namespace "com.tlab.webkit"
77
//compileSdk 30
88
//compileSdk 31
99
//compileSdk 32
@@ -34,7 +34,6 @@ android {
3434
}
3535
}
3636
}
37-
3837
buildTypes {
3938
release {
4039
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -51,12 +50,21 @@ android {
5150
}
5251
}
5352

53+
ext {
54+
geckoviewChannel = ""
55+
geckoviewVersion = "125.0.20240425211020"
56+
}
57+
5458
dependencies {
5559
compileOnly fileTree(dir: 'libs', include: 'classes.jar')
60+
implementation 'androidx.core:core:1.15.0'
61+
implementation 'androidx.annotation:annotation-jvm:1.9.1'
62+
implementation "org.mozilla.geckoview:geckoview${geckoviewChannel}:${geckoviewVersion}"
63+
//implementation "org.mozilla.geckoview:geckoview${geckoviewChannel}-armeabi-v7a:${geckoviewVersion}"
64+
//implementation "org.mozilla.geckoview:geckoview${geckoviewChannel}-arm64-v8a:${geckoviewVersion}"
5665
}
5766

5867
android.libraryVariants.configureEach { variant ->
59-
variant.outputs.each { output ->
60-
output.packageLibrary.exclude('libs/classes.jar')
68+
variant.outputs.each { output -> output.packageLibrary.exclude('libs/classes.jar')
6169
}
6270
}

libwebview/consumer-rules.pro renamed to libTLabWebView/consumer-rules.pro

File renamed without changes.

libwebview/libs/classes.jar renamed to libTLabWebView/libs/classes.jar

File renamed without changes.

libwebview/proguard-rules.pro renamed to libTLabWebView/proguard-rules.pro

File renamed without changes.

libwebview/src/main/AndroidManifest.xml renamed to libTLabWebView/src/main/AndroidManifest.xml

File renamed without changes.

libwebview/src/main/cpp/CMakeLists.txt renamed to libTLabWebView/src/main/cpp/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.10.1)
22

33
project("project-root")
44

5-
add_subdirectory(libwebview)
5+
set(CMAKE_CXX_STANDARD 17)
6+
7+
add_subdirectory(native)
68
add_subdirectory(glutil)
79
add_subdirectory(SharedTexture)

libwebview/src/main/cpp/LogUtil/JniLog.h renamed to libTLabWebView/src/main/cpp/LogUtil/JniLog.h

File renamed without changes.

libwebview/src/main/cpp/SharedTexture/CMakeLists.txt renamed to libTLabWebView/src/main/cpp/SharedTexture/CMakeLists.txt

File renamed without changes.

0 commit comments

Comments
 (0)