diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | platform/android/java/build.gradle | 6 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/platform/android/java/AndroidManifest.xml b/platform/android/java/AndroidManifest.xml index 29ddd844ba..613d24fbd2 100644 --- a/platform/android/java/AndroidManifest.xml +++ b/platform/android/java/AndroidManifest.xml @@ -43,13 +43,6 @@ <!--Custom application XML added by add-ons--> <!--CHUNK_APPLICATION_BEGIN--> -<activity android:name="com.google.android.gms.ads.AdActivity" - android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/> -<meta-data android:name="com.google.android.gms.version" - android:value="@integer/google_play_services_version" /> -<meta-data - android:name="com.google.android.gms.ads.AD_MANAGER_APP" - android:value="true"/> <!--CHUNK_APPLICATION_END--> </application> diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index 868bbee831..c468277daa 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -10,8 +10,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' -//CHUNK_BUILD_DEPENDENCIES_BEGIN -//CHUNK_BUILD_DEPENDENCIES_END +//CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN +//CHUNK_BUILDSCRIPT_DEPENDENCIES_END } } @@ -31,7 +31,6 @@ allprojects { dependencies { implementation "com.android.support:support-core-utils:28.0.0" //CHUNK_DEPENDENCIES_BEGIN -compile ('com.google.android.gms:play-services-ads:16.0.0') { exclude group: 'com.android.support' } //CHUNK_DEPENDENCIES_END } @@ -66,7 +65,6 @@ android { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src' //DIR_SRC_BEGIN -,'/home/red/coding/godot-demos/2d/platformer/android/admob/src' //DIR_SRC_END ] res.srcDirs = [ diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index a6a947761b..193a3fa2c6 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2485,7 +2485,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments, } (*r_pipe) += buf; if (p_pipe_mutex) { - p_pipe_mutex->lock(); + p_pipe_mutex->unlock(); } } |