Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.gradle
.idea
local.properties
/.cxx
27 changes: 18 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
namespace "ru.ivanarh.jndcrash"
ndkVersion "27.2.12479018"
compileSdk 35
defaultConfig {
minSdkVersion 15
targetSdkVersion 28
minSdkVersion 24
targetSdkVersion 35
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_static", "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
arguments "-DANDROID_STL=c++_static", "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON", "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
}
}
ndk {
abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
abiFilters "arm64-v8a", "x86_64"
}
}

Expand All @@ -30,21 +32,26 @@ android {
path "CMakeLists.txt"
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath("com.android.tools.build:gradle:8.9.1")
}
}

repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand All @@ -53,5 +60,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:support-annotations:28.0.0'


implementation 'androidx.annotation:annotation:1.9.1'
}
3 changes: 1 addition & 2 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ru.ivanarh.jndcrash"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
5 changes: 3 additions & 2 deletions src/main/java/ru/ivanarh/jndcrash/NDCrash.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

/**
* Main binding class for NDCrash functionality.
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/ru/ivanarh/jndcrash/NDCrashService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.IBinder;
import android.support.annotation.CallSuper;
import android.util.Log;

import androidx.annotation.CallSuper;

/**
* Service for out-of-process crash handling daemon. Should be run from a separate process.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/ivanarh/jndcrash/NDCrashUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.os.Process;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

/**
* Contains some utility code.
Expand Down