Google Play is removed from the build

Author: yorugac

custom_rules.xml

@@ -30,24 +30,6 @@ limitations under the License.
     <os family="windows" />
   </condition>
 
-  <target name="initialize-google-play-games_lib"
-          description="Initialize Google Play Games library in the project.">
-    <!-- Copy the library to the project. -->
-    <!-- Temporarily disable this while we use a debug version of the lib -->
-    <copy todir="google-play-services_lib">
-      <fileset dir="${sdk.dir}/extras/google/google_play_services/libproject/google-play-services_lib"/>
-    </copy>
-    <!-- Create an ant project for the library. -->
-    <exec executable="${android_exe}">
-      <arg value="update"/>
-      <arg value="project"/>
-      <arg value="-p"/>
-      <arg value="google-play-services_lib"/>
-      <arg value="-t"/>
-      <arg value="${target}"/>
-    </exec>
-  </target>
-
   <target name="initialize-android-support_lib"
           description="Initialize Android Support library in the project.">
     <!-- Copy the library to the project. -->
@@ -57,8 +39,6 @@ limitations under the License.
   </target>
 
   <target name="-pre-build" depends="fplbase.setup-fplbase,
-                                     initialize-google-play-games_lib,
                                      initialize-android-support_lib"/>
-  <target name="-pre-clean" depends="initialize-google-play-games_lib,
-                                     initialize-android-support_lib" />
+  <target name="-pre-clean" depends="initialize-android-support_lib" />
 </project>

jni/libs/gpg/Android.mk

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+LOCAL_PATH:=$(call my-dir)
+
+# Project directory relative to this file.
+ZOOSHI_DIR:=$(LOCAL_PATH)/../../..
+include $(ZOOSHI_DIR)/jni/android_config.mk
+
 LOCAL_PATH:=$(call my-dir)/../../..
 
 # Project directory relative to this file.
@@ -102,7 +108,6 @@ LOCAL_C_INCLUDES := \
   $(DEPENDENCIES_BREADBOARD_MODULE_LIBRARY_DIR)/include \
   $(DEPENDENCIES_SCENE_LAB_DIR)/include \
   $(DEPENDENCIES_FPLUTIL_DIR)/libfplutil/include \
-  $(DEPENDENCIES_GPG_DIR)/include \
   $(DEPENDENCIES_WEBP_DIR)/src \
   $(DEPENDENCIES_BULLETPHYSICS_DIR)/src \
   $(DEPENDENCIES_FIREBASE_DIR)/include \
@@ -197,7 +202,7 @@ ZOOSHI_FLATBUFFER_INCLUDE_DIRS := \
   $(DEPENDENCIES_BREADBOARD_MODULE_LIBRARY_DIR)/schemas
 
 # Override JNI_OnLoad functions.
-FPLBASE_JNI_ONLOAD_FUNCTIONS := SDL_JNI_OnLoad GPG_JNI_OnLoad
+FPLBASE_JNI_ONLOAD_FUNCTIONS := SDL_JNI_OnLoad
 
 ifeq (,$(ZOOSHI_RUN_ONCE))
 ZOOSHI_RUN_ONCE := 1
@@ -226,7 +231,6 @@ clean: clean_assets clean_generated_includes
 LOCAL_STATIC_LIBRARIES := \
   libbreadboard \
   libbreadboard_module_library \
-  libgpg \
   libmathfu \
   libwebp \
   libfplbase \
@@ -279,4 +283,3 @@ $(call import-module,motive/jni)
 $(call import-module,corgi/component_library/jni)
 $(call import-module,scene_lab/jni)
 $(call import-module,$(notdir $(DEPENDENCIES_WEBP_DIR)))
-

jni/libs/src/Android.mk

@@ -13,10 +13,5 @@
 # Project target.
 target=android-23
 
-# google-play-service_lib directory is copied into this project by the
-# copy-google-play-games_lib task in custom_rules.xml.
-android.library.reference.1=./google-play-services_lib
-
 # Location of the java source files used by this project.
 source.dir=src_java
-