etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Android.mk and show unsupported warning

This commit is contained in:
mar-v-in 2015-03-18 16:23:00 +01:00
parent 787efa1da4
commit 1295192130
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Android.mk
View File

@ -18,22 +18,22 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
unified_dir := ../UnifiedNlp unified_dir := ../UnifiedNlp
appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat 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) \ 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, 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_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
LOCAL_AAPT_FLAGS := --auto-add-overlay \ LOCAL_AAPT_FLAGS := --auto-add-overlay \
--extra-packages android.support.v7.appcompat \ --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, # For some reason framework has to be added here else GeocoderParams is not found,
# this way everything else is duplicated, but atleast compiles... # this way everything else is duplicated, but atleast compiles...
LOCAL_JAVA_LIBRARIES := com.google.android.maps \ LOCAL_JAVA_LIBRARIES := framework \
framework \
com.android.location.provider com.android.location.provider
# Include compat v9 files if necassary # Include compat v9 files if necassary
@ -42,8 +42,11 @@ LOCAL_JAVA_LIBRARIES += UnifiedNlpCompatV9
endif endif
LOCAL_STATIC_JAVA_LIBRARIES := UnifiedNlpApi \ LOCAL_STATIC_JAVA_LIBRARIES := UnifiedNlpApi \
GmsApi \
android-support-v4 \ android-support-v4 \
android-support-v7-appcompat \ android-support-v7-appcompat \
wire-runtime \
vtm vtm-themes vtm-extras vtm-android
LOCAL_PACKAGE_NAME := GmsCore LOCAL_PACKAGE_NAME := GmsCore
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
@ -52,3 +55,15 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE) 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)

2
play-services-core/src/main/AndroidManifest.xml
View File

@ -21,7 +21,7 @@
android:versionCode="6772000"> android:versionCode="6772000">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="10"
android:targetSdkVersion="21" /> android:targetSdkVersion="21" />
<permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <permission android:name="com.google.android.c2dm.permission.RECEIVE" />