-
Notifications
You must be signed in to change notification settings - Fork 274
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from Pascal66/Studio3.5
Android Studio 3.5 (No using AndroidX for now)
- Loading branch information
Showing
346 changed files
with
29,147 additions
and
29,483 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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') | ||
} |
18 changes: 18 additions & 0 deletions
18
ARMarker/build/generated/source/buildConfig/debug/de/rwth/BuildConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"; | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.