fix gradle compile

sdkbox · Dec 12, 2017 · 65a8d2c · 65a8d2c
1 parent 6cf30d9
commit 65a8d2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,3 +68,6 @@ js/frameworks/runtime-src/proj.android/libs/cheetah-mobile/obj/
 js/frameworks/runtime-src/proj.android/libs/cheetah-mobile/gen/
 js/frameworks/runtime-src/proj.android/libs/cheetah-mobile/bin/
 
+**/proj.android/build/
+**/proj.android-studio/build/
+
diff --git a/cpp/proj.android/AndroidManifest.xml b/cpp/proj.android/AndroidManifest.xml
@@ -39,7 +39,7 @@
         <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.facebook.ads.InterstitialAdActivity" />
         <activity android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:hardwareAccelerated="true" android:name="com.unity3d.ads.android.view.UnityAdsFullscreenActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
         <activity android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:hardwareAccelerated="true" android:name="com.unity3d.ads.android2.view.UnityAdsFullscreenActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-        <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.jirbo.adcolony.AdColonyOverlay" android:theme="@@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+        <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.jirbo.adcolony.AdColonyOverlay" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
         <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.jirbo.adcolony.AdColonyFullscreen" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" />
         <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.jirbo.adcolony.AdColonyBrowser" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" />
         <activity android:configChanges="keyboardHidden|orientation|screenSize" android:name="com.vungle.publisher.FullScreenAdActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
@@ -64,7 +64,6 @@
         <activity android:configChanges="orientation|keyboardHidden|screenSize" android:hardwareAccelerated="true" android:name="com.tapjoy.TJAdUnitActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
         <activity android:configChanges="orientation|keyboardHidden|screenSize" android:name="com.tapjoy.mraid.view.ActionHandler" />
         <activity android:configChanges="orientation|keyboardHidden|screenSize" android:name="com.tapjoy.mraid.view.Browser" />
-        <activity android:configChanges="orientation|keyboardHidden|screenSize" android:hardwareAccelerated="true" android:name="com.tapjoy.TJAdUnitActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <receiver android:enabled="true" android:exported="true" android:name="com.appodeal.ads.AppodealPackageAddedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_ADDED" />

diff --git a/cpp/proj.android/build.gradle b/cpp/proj.android/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
     buildToolsVersion '26.0.2'
+    useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "org.cocos2dx.appodeal"
@@ -45,9 +46,7 @@ android {
 }
 
 dependencies {
-    //compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':plugin_appodeal')
-    //compile project(':lib_support_v4')
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':lib_adcolony')
-    //compile 'com.android.support:support-v4:25.3.0'
+    compile project(':lib_gps')
 }
diff --git a/cpp/proj.android/libs/gps/build.gradle b/cpp/proj.android/libs/gps/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 10