Skip to content

Commit c06eb07

Browse files
committed
fix: 1. fix ndk error 2. update config
1 parent 4882bef commit c06eb07

4 files changed

Lines changed: 19 additions & 14 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
- name: Execute Gradle build
5757
run: ./gradlew assembleLibrariesRelease
5858

59+
- name: Stop Gradle Daemon
60+
run: ./gradlew --stop # <--- 释放内存
61+
5962
# Perform the analysis
6063
- name: Perform CodeQL Analysis
6164
uses: github/codeql-action/analyze@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6

.github/workflows/publish-maven.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ jobs:
3535
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
3636
restore-keys: |
3737
${{ runner.os }}-gradle-
38-
39-
- name: Import GPG key
38+
39+
- name: Import GPG Key
40+
env:
41+
GPG_KEY_CONTENT: ${{ secrets.GPG_PRIVATE_KEY }}
4042
run: |
41-
echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --batch --import
42-
gpg --list-secret-keys --keyid-format LONG
43+
echo "$GPG_KEY_CONTENT" | base64 -d | gpg --batch --import
44+
gpg --list-secret-keys --keyid-format LONG
4345
4446
- name: Grant execute permission for gradlew
4547
run: chmod +x gradlew

features/dd-sdk-android-ndk/src/main/cpp/datadog-native-lib.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void update_app_start_time_millis(jlong time_ms) {
134134

135135
/// Jni bindings
136136
extern "C" JNIEXPORT void JNICALL
137-
Java_com_datadog_android_ndk_internal_NdkCrashReportsFeature_registerSignalHandler(
137+
Java_cloud_flashcat_android_ndk_internal_NdkCrashReportsFeature_registerSignalHandler(
138138
JNIEnv *env,
139139
jobject /* this */,
140140
jstring storage_path,
@@ -149,14 +149,14 @@ Java_com_datadog_android_ndk_internal_NdkCrashReportsFeature_registerSignalHandl
149149

150150

151151
extern "C" JNIEXPORT void JNICALL
152-
Java_com_datadog_android_ndk_internal_NdkCrashReportsFeature_unregisterSignalHandler(
152+
Java_cloud_flashcat_android_ndk_internal_NdkCrashReportsFeature_unregisterSignalHandler(
153153
JNIEnv *env,
154154
jobject /* this */) {
155155
stop_monitoring();
156156
}
157157

158158
extern "C" JNIEXPORT void JNICALL
159-
Java_com_datadog_android_ndk_internal_NdkCrashReportsFeature_updateTrackingConsent(
159+
Java_cloud_flashcat_android_ndk_internal_NdkCrashReportsFeature_updateTrackingConsent(
160160
JNIEnv *env,
161161
jobject /* this */,
162162
jint consent) {

features/dd-sdk-android-ndk/src/test/cpp/integration-tests.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@ void test_generate_log(
7171

7272

7373
extern "C" JNIEXPORT int JNICALL
74-
Java_com_datadog_android_ndk_NdkTests_runNdkSuitTests(JNIEnv *env, jobject) {
74+
Java_cloud_flashcat_android_ndk_NdkTests_runNdkSuitTests(JNIEnv *env, jobject) {
7575
return run_test_suites();
7676
}
7777

7878
extern "C" JNIEXPORT int JNICALL
79-
Java_com_datadog_android_ndk_NdkTests_runNdkStandaloneTests(JNIEnv *env, jobject) {
79+
Java_cloud_flashcat_android_ndk_NdkTests_runNdkStandaloneTests(JNIEnv *env, jobject) {
8080
return run_jni_env_dependent_tests(env);
8181
}
8282

8383
extern "C"
8484
JNIEXPORT void JNICALL
85-
Java_com_datadog_android_ndk_NdkTests_initNdkErrorHandler(
85+
Java_cloud_flashcat_android_ndk_NdkTests_initNdkErrorHandler(
8686
JNIEnv *env,
8787
jobject thiz,
8888
jstring storage_dir) {
@@ -92,7 +92,7 @@ Java_com_datadog_android_ndk_NdkTests_initNdkErrorHandler(
9292

9393
extern "C"
9494
JNIEXPORT void JNICALL
95-
Java_com_datadog_android_ndk_NdkTests_simulateSignalInterception(
95+
Java_cloud_flashcat_android_ndk_NdkTests_simulateSignalInterception(
9696
JNIEnv *env,
9797
jobject thiz,
9898
jint signal,
@@ -112,7 +112,7 @@ Java_com_datadog_android_ndk_NdkTests_simulateSignalInterception(
112112

113113
extern "C"
114114
JNIEXPORT void JNICALL
115-
Java_com_datadog_android_ndk_NdkTests_simulateFailedSignalInterception(
115+
Java_cloud_flashcat_android_ndk_NdkTests_simulateFailedSignalInterception(
116116
JNIEnv *env,
117117
jobject thiz,
118118
jint signal,
@@ -146,7 +146,7 @@ Java_com_datadog_android_ndk_NdkTests_simulateFailedSignalInterception(
146146

147147
extern "C"
148148
JNIEXPORT void JNICALL
149-
Java_com_datadog_android_ndk_NdkTests_updateTrackingConsent(
149+
Java_cloud_flashcat_android_ndk_NdkTests_updateTrackingConsent(
150150
JNIEnv *env,
151151
jobject /* this */,
152152
jint consent) {
@@ -155,7 +155,7 @@ Java_com_datadog_android_ndk_NdkTests_updateTrackingConsent(
155155

156156
extern "C"
157157
JNIEXPORT void JNICALL
158-
Java_com_datadog_android_ndk_NdkTests_updateAppStartTime(
158+
Java_cloud_flashcat_android_ndk_NdkTests_updateAppStartTime(
159159
JNIEnv *env,
160160
jobject /* this */,
161161
jlong app_start_time_ms) {

0 commit comments

Comments
 (0)