Skip to content

Commit ba6382d

Browse files
committed
Firebase is removed from the game.
The following functionality was deleted: - ads, reward videos - invites - messages - analytics - remote configuration of menu
1 parent 065f5ac commit ba6382d

25 files changed

+17
-1407
lines changed

.travis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ before_install:
3030
- unzip -qq android-ndk-r14b-linux-x86_64.zip -d $ANDROID_SDK_ROOT/ndk-bundle
3131
- export NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle/android-ndk-r14b
3232
- echo -e "sdk.dir=$ANDROID_SDK_ROOT\nndk.dir=$NDK_ROOT\n" > local.properties
33-
- wget https://dl.google.com/firebase/sdk/cpp/firebase_cpp_sdk_3.1.0.zip
34-
- unzip -qq firebase_cpp_sdk_3.1.0.zip -d ./dependencies/
35-
- export FIREBASE_SDK=$(pwd)/dependencies/firebase_cpp_sdk/
33+
- echo `convert -list configure`
3634

3735
script:
3836
- ./gradlew build

AndroidManifest.xml

-23
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,7 @@ limitations under the License.
8787
android:pathPrefix="/zooshi/launch/hmd" />
8888
</intent-filter>
8989
</activity>
90-
<meta-data android:name="com.google.android.gms.games.APP_ID"
91-
android:value="@string/app_id" />
92-
<meta-data android:name="com.google.android.gms.version"
93-
android:value="@integer/google_play_services_version"/>
9490

95-
<service android:name="com.google.firebase.messaging.cpp.ListenerService"
96-
android:exported="false" >
97-
<intent-filter>
98-
<action android:name="com.google.firebase.MESSAGING_EVENT" />
99-
</intent-filter>
100-
</service>
101-
102-
<service android:name="com.google.firebase.messaging.cpp.FcmInstanceIDListenerService"
103-
android:exported="false" >
104-
<intent-filter>
105-
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
106-
</intent-filter>
107-
</service>
108-
109-
<service android:name="com.google.firebase.messaging.cpp.RegistrationIntentService"
110-
android:exported="false" >
111-
</service>
11291
</application>
11392

11493
<!-- Minimum for SDL -->
@@ -128,7 +107,5 @@ limitations under the License.
128107
<uses-feature android:name="android.hardware.gamepad" android:required="false"/>
129108
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
130109

131-
<!-- Expose Google Play Services version for Google Search -->
132-
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
133110
</manifest>
134111
<!-- END_INCLUDE(manifest) -->

build.gradle

-15
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ buildscript {
55
}
66
dependencies {
77
classpath 'com.android.tools.build:gradle:2.2.1'
8-
classpath 'com.google.gms:google-services:3.0.0'
98
}
109
}
1110

@@ -68,26 +67,12 @@ android {
6867
}
6968
}
7069

71-
repositories {
72-
flatDir {
73-
dirs System.env.FIREBASE_SDK + '/libs/android'
74-
}
75-
}
76-
7770
dependencies {
7871
compile fileTree(dir: 'libs', include: ['*.jar'])
7972
compile fileTree(dir: 'libs/android', include: ['*.aar'])
80-
compile 'com.google.firebase:firebase-ads:10.0.1'
81-
compile 'com.google.firebase:firebase-core:10.0.1'
82-
compile 'com.google.firebase:firebase-invites:10.0.1'
83-
compile 'com.google.firebase:firebase-messaging:10.0.1'
84-
compile 'com.google.firebase:firebase-config:10.0.1'
85-
compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
8673
compile 'com.android.support:support-v4:23.0+'
8774
}
8875

89-
apply plugin: 'com.google.gms.google-services'
90-
9176
task copyFplbase(type: Copy) {
9277
def fplbase_dir = ''
9378
def github_dir = new File('dependencies/fplbase/src_java')

jni/libs/src/Android.mk

+1-45
Original file line numberDiff line numberDiff line change
@@ -59,38 +59,6 @@ endif
5959
PROJECT_GLOBAL_BUILD_RULES_DEFINED:=1
6060

6161
STL:=$(firstword $(subst _, ,$(APP_STL)))
62-
FIREBASE_LIBRARY_PATH:=\
63-
$(DEPENDENCIES_FIREBASE_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
64-
65-
include $(CLEAR_VARS)
66-
LOCAL_MODULE := libfirebase_admob
67-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libadmob.a
68-
include $(PREBUILT_STATIC_LIBRARY)
69-
70-
include $(CLEAR_VARS)
71-
LOCAL_MODULE := libfirebase_app
72-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libapp.a
73-
include $(PREBUILT_STATIC_LIBRARY)
74-
75-
include $(CLEAR_VARS)
76-
LOCAL_MODULE := libfirebase_analytics
77-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libanalytics.a
78-
include $(PREBUILT_STATIC_LIBRARY)
79-
80-
include $(CLEAR_VARS)
81-
LOCAL_MODULE := libfirebase_invites
82-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libinvites.a
83-
include $(PREBUILT_STATIC_LIBRARY)
84-
85-
include $(CLEAR_VARS)
86-
LOCAL_MODULE := libfirebase_messaging
87-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libmessaging.a
88-
include $(PREBUILT_STATIC_LIBRARY)
89-
90-
include $(CLEAR_VARS)
91-
LOCAL_MODULE := libfirebase_config
92-
LOCAL_SRC_FILES := $(FIREBASE_LIBRARY_PATH)/libremote_config.a
93-
include $(PREBUILT_STATIC_LIBRARY)
9462

9563
include $(CLEAR_VARS)
9664

@@ -110,16 +78,13 @@ LOCAL_C_INCLUDES := \
11078
$(DEPENDENCIES_FPLUTIL_DIR)/libfplutil/include \
11179
$(DEPENDENCIES_WEBP_DIR)/src \
11280
$(DEPENDENCIES_BULLETPHYSICS_DIR)/src \
113-
$(DEPENDENCIES_FIREBASE_DIR)/include \
11481
$(COMPONENTS_GENERATED_OUTPUT_DIR) \
11582
$(BREADBOARD_MODULE_LIBRARY_GENERATED_OUTPUT_DIR) \
11683
$(ZOOSHI_GENERATED_OUTPUT_DIR) \
11784
$(SCENE_LAB_GENERATED_OUTPUT_DIR) \
11885
$(LOCAL_PATH)/src
11986

12087
LOCAL_SRC_FILES := \
121-
src/admob.cpp \
122-
src/analytics.cpp \
12388
src/camera.cpp \
12489
src/components/attributes.cpp \
12590
src/components/audio_listener.cpp \
@@ -147,9 +112,7 @@ LOCAL_SRC_FILES := \
147112
src/inputcontrollers/android_cardboard_controller.cpp \
148113
src/inputcontrollers/gamepad_controller.cpp \
149114
src/inputcontrollers/onscreen_controller.cpp \
150-
src/invites.cpp \
151115
src/main.cpp \
152-
src/messaging.cpp \
153116
src/modules/attributes.cpp \
154117
src/modules/gpg.cpp \
155118
src/modules/patron.cpp \
@@ -159,7 +122,6 @@ LOCAL_SRC_FILES := \
159122
src/modules/ui_string.cpp \
160123
src/modules/zooshi.cpp \
161124
src/railmanager.cpp \
162-
src/remote_config.cpp \
163125
src/states/game_menu_state.cpp \
164126
src/states/game_over_state.cpp \
165127
src/states/gameplay_state.cpp \
@@ -244,13 +206,7 @@ LOCAL_STATIC_LIBRARIES := \
244206
libharfbuzz \
245207
libflatbuffers \
246208
libflatbuffers_extra \
247-
libbullet \
248-
libfirebase_admob \
249-
libfirebase_analytics \
250-
libfirebase_invites \
251-
libfirebase_messaging \
252-
libfirebase_config \
253-
libfirebase_app
209+
libbullet
254210

255211
LOCAL_SHARED_LIBRARIES :=
256212

src/admob.cpp

-178
This file was deleted.

0 commit comments

Comments
 (0)