Skip to content

Commit

Permalink
Merge pull request #1 from Pascal66/Studio3.5
Browse files Browse the repository at this point in the history
Android Studio 3.5 (No using AndroidX for now)
  • Loading branch information
rafaisen authored Jan 20, 2020
2 parents 28a6945 + 5853c2b commit fbb1cb2
Show file tree
Hide file tree
Showing 346 changed files with 29,147 additions and 29,483 deletions.
14 changes: 0 additions & 14 deletions ARMarker/AndroidManifest.xml

This file was deleted.

8 changes: 4 additions & 4 deletions ARMarker/Application.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_BUILD_SCRIPT := $(call my-dir)/jni/Android.mk
APP_PROJECT_PATH := $(call my-dir)
APP_PLATFORM := 3
APP_MODULES := openCV
APP_BUILD_SCRIPT := $(call my-dir)/jniLibs/Android.mk
APP_PROJECT_PATH := $(call my-dir)
APP_PLATFORM := 3
APP_MODULES := openCV
46 changes: 46 additions & 0 deletions ARMarker/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 29

defaultConfig {
minSdkVersion 19
targetSdkVersion 29
versionCode = 1
versionName = '1.0'
multiDexEnabled = true
// externalNativeBuild {
// cmake {
// cppFlags "-frtti -fexceptions"
// abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
// }
// }
}
// sourceSets {
// main {
// jniLibs.srcDirs = ['src/main/jniLibs']
// }
// }
// externalNativeBuild {
// cmake {
// path "CMakeLists.txt"
// }
// }
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

}

dependencies {
implementation project(path: ':droidar')
implementation 'org.opencv:opencv-android:3.4.1'
// implementation project(':openCVLibrary')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package de.rwth;

public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "de.rwth";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "de.rwth";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
288 changes: 0 additions & 288 deletions ARMarker/jni/Android.mk

This file was deleted.

Loading

0 comments on commit fbb1cb2

Please sign in to comment.