From 12951921307b1ca97eba9dbae8c28c135da0e674 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Wed, 18 Mar 2015 16:23:00 +0100
Subject: [PATCH] Update Android.mk and show unsupported warning

---
 Android.mk                                    | 25 +++++++++++++++----
 .../src/main/AndroidManifest.xml              |  2 +-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index d5ff081f..40a0a5c5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,22 +18,22 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 unified_dir := ../UnifiedNlp
 appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat
-res_dir := res $(unified_dir)/res $(appcompat_dir)/res
+res_dir := play-services-core/src/main/res $(unified_dir)/unifiednlp-base/src/main/res $(appcompat_dir)/res
 
 LOCAL_SRC_FILES := $(call all-java-files-under, play-services-core/src/main/java) \
                    $(call all-java-files-under, play-services-core/src/main/protos-java) \
-                   $(call all-java-files-under, $(unified_dir)/src) \
+                   $(call all-java-files-under, $(unified_dir)/unifiednlp-base/src/main/java)
 
+LOCAL_MANIFEST_FILE := play-services-core/src/main/AndroidManifest.xml
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
                     --extra-packages android.support.v7.appcompat \
-                    --extra-packages org.microg.nlp \
+                    --extra-packages org.microg.nlp
 
 # For some reason framework has to be added here else GeocoderParams is not found, 
 # this way everything else is duplicated, but atleast compiles...
-LOCAL_JAVA_LIBRARIES := com.google.android.maps \
-                        framework \
+LOCAL_JAVA_LIBRARIES := framework \
                         com.android.location.provider
 
 # Include compat v9 files if necassary
@@ -42,8 +42,11 @@ LOCAL_JAVA_LIBRARIES += UnifiedNlpCompatV9
 endif
 
 LOCAL_STATIC_JAVA_LIBRARIES := UnifiedNlpApi \
+                               GmsApi \
                                android-support-v4 \
                                android-support-v7-appcompat \
+                               wire-runtime \
+                               vtm vtm-themes vtm-extras vtm-android
 
 LOCAL_PACKAGE_NAME := GmsCore
 LOCAL_SDK_VERSION := current
@@ -52,3 +55,15 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+   vtm:libs/vtm-0.6.0-SNAPSHOT.jar \
+   vtm-extras:libs/vtm-extras-0.6.0-SNAPSHOT.jar \
+   vtm-themes:libs/vtm-themes-0.6.0-SNAPSHOT.jar \
+   vtm-android:libs/vtm-android-0.6.0-SNAPSHOT.aar
+
+include $(BUILD_MULTI_PREBUILT)
+
+$(warning Building GmsCore using Android.mk is not tested and might be broken. Consider compiling with gradle and using the prebuilt module feature of AOSP build system)
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 56b63f51..1c40c3d1 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
     android:versionCode="6772000">
 
     <uses-sdk
-        android:minSdkVersion="16"
+        android:minSdkVersion="10"
         android:targetSdkVersion="21" />
 
     <permission android:name="com.google.android.c2dm.permission.RECEIVE" />