-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
29 changed files
with
988 additions
and
837 deletions.
There are no files selected for viewing
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
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
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 @@ | ||
/build |
Binary file not shown.
Binary file not shown.
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
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/debug/jniLibs"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/debug/jniLibs"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/mergeDebugShaders/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/debug/shaders"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/debug/shaders"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android/build/intermediates/incremental/packageDebugAssets/merger.xml
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,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/assets"/><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/debug/assets"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/assets"/><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/debug/assets"/></dataSet></merger> |
Binary file not shown.
36 changes: 18 additions & 18 deletions
36
android/build/outputs/logs/manifest-merger-debug-report.txt
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,25 +1,25 @@ | ||
-- Merging decision tree log --- | ||
manifest | ||
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:1-3:12 | ||
package | ||
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:2:5-61 | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:2:5-61 | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
xmlns:android | ||
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69 | ||
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml:1:11-69 | ||
uses-sdk | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
android:targetSdkVersion | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
android:minSdkVersion | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Users/manuelgarciamarin/Proyectos/IONIC/dangoanime/node_modules/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
ADDED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml | ||
INJECTED from /Volumes/Development_Lacie/Development/new/capacitor-video-player/android/src/main/AndroidManifest.xml |
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,24 @@ | ||
# Project-wide Gradle settings. | ||
|
||
# IDE (e.g. Android Studio) users: | ||
# Gradle settings configured through the IDE *will override* | ||
# any settings specified in this file. | ||
|
||
# For more details on how to configure your build environment visit | ||
# http://www.gradle.org/docs/current/userguide/build_environment.html | ||
|
||
# Specifies the JVM arguments used for the daemon process. | ||
# The setting is particularly useful for tweaking memory settings. | ||
org.gradle.jvmargs=-Xmx1536m | ||
|
||
# When configured, Gradle will run in incubating parallel mode. | ||
# This option should only be used with decoupled projects. More details, visit | ||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects | ||
# org.gradle.parallel=true | ||
|
||
# AndroidX package structure to make it clearer which packages are bundled with the | ||
# Android operating system, and which are packaged with your app's APK | ||
# https://developer.android.com/topic/libraries/support-library/androidx-rn | ||
android.useAndroidX=true | ||
# Automatically convert third-party libraries to use AndroidX | ||
android.enableJetifier=true |
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,21 @@ | ||
# Add project specific ProGuard rules here. | ||
# You can control the set of applied configuration files using the | ||
# proguardFiles setting in build.gradle. | ||
# | ||
# For more details, see | ||
# http://developer.android.com/guide/developing/tools/proguard.html | ||
|
||
# If your project uses WebView with JS, uncomment the following | ||
# and specify the fully qualified class name to the JavaScript interface | ||
# class: | ||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
# public *; | ||
#} | ||
|
||
# Uncomment this to preserve the line number information for | ||
# debugging stack traces. | ||
#-keepattributes SourceFile,LineNumberTable | ||
|
||
# If you keep the line number information, uncomment this to | ||
# hide the original source file name. | ||
#-renamesourcefileattribute SourceFile |
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,2 @@ | ||
include ':capacitor-android' | ||
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') |
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
Oops, something went wrong.