Skip to content

Commit 2357137

Browse files
codeanticodecodeanticode
committed
placed libs manifest files in correct location
1 parent e6fb085 commit 2357137

File tree

14 files changed

+79
-72
lines changed

14 files changed

+79
-72
lines changed

‎libs/google-vr/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
// Dummy Gradle project to be able to import local aar files:
22
// https://stackoverflow.com/a/60888941
33

4+
//import com.android.build.api.attributes.*
5+
//.attributes { attribute(BuildTypeAttr.ATTRIBUTE, project.objects.named(BuildTypeAttr.class,"default")) }
6+
47
configurations.maybeCreate("default")
5-
artifacts.add("default", file('sdk-audio-1.180.0.aar'))
68
artifacts.add("default", file('sdk-base-1.180.0.aar'))
7-
artifacts.add("default", file('sdk-common-1.180.0.aar'))
9+
artifacts.add("default", file('sdk-common-1.180.0.aar'))
10+
artifacts.add("default", file('sdk-audio-1.180.0.aar'))

‎libs/processing-ar/build.gradle

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
apply plugin: 'com.android.library'
1+
plugins {
2+
id 'com.android.library'
3+
}
24

35
android {
46
compileSdkVersion 33
57
defaultConfig {
68
minSdkVersion 19
79
targetSdkVersion 33
810
}
9-
sourceSets {
10-
main {
11-
manifest.srcFile 'AndroidManifest.xml'
12-
java.srcDirs = ['../../../mode/libraries/ar/src']
13-
assets.srcDirs = ['../../../mode/libraries/ar/src/assets']
14-
}
15-
}
11+
// sourceSets {
12+
// main {
13+
// manifest.srcFile 'AndroidManifest.xml'
14+
// java.srcDirs = ['../../../mode/libraries/ar/src']
15+
// assets.srcDirs = ['../../../mode/libraries/ar/src/assets']
16+
// }
17+
// }
1618
compileOptions {
1719
sourceCompatibility JavaVersion.VERSION_1_8
1820
targetCompatibility JavaVersion.VERSION_1_8
1921
}
20-
productFlavors {
22+
23+
buildTypes {
24+
release {
25+
minifyEnabled false
26+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
27+
}
2128
}
2229
}
2330

‎libs/processing-ar/gradle.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎libs/processing-ar/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎libs/processing-ar/project.properties

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎libs/processing-ar/AndroidManifest.xml renamed to ‎libs/processing-ar/src/main/AndroidManifest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="processing_ar">
3-
4-
<application />
5-
</manifest>
2+
package="processing_ar" />

‎libs/processing-vr/AndroidManifest.xml renamed to ‎libs/processing-core/src/main/AndroidManifest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="processing_vr">
3-
4-
<application />
5-
</manifest>
2+
package="processing_core" />

‎libs/processing-vr/build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ android {
66
minSdkVersion 19
77
targetSdkVersion 33
88
}
9-
sourceSets {
10-
main {
11-
manifest.srcFile 'AndroidManifest.xml'
12-
java.srcDirs = ['../../../mode/libraries/vr/src']
13-
}
14-
}
9+
10+
// sourceSets {
11+
// main {
12+
// manifest.srcFile 'AndroidManifest.xml'
13+
// java.srcDirs = ['../../../mode/libraries/vr/src']
14+
// }
15+
// }
1516
compileOptions {
1617
sourceCompatibility JavaVersion.VERSION_1_8
1718
targetCompatibility JavaVersion.VERSION_1_8
@@ -21,6 +22,8 @@ android {
2122
}
2223

2324
dependencies {
25+
2426
implementation project(':libs:processing-core')
2527
implementation project(':libs:google-vr')
28+
// implementation files('libs/google-vr/sdk-base-1.180.0.ar')
2629
}

‎libs/processing-vr/gradle.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎libs/processing-vr/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

0 commit comments

Comments
 (0)