Fix mapsv1
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 26017f1..d6e404a 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -3,8 +3,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := GmsCore
LOCAL_SRC_FILES := com.google.android.gms-10545451.apk
-LOCAL_REQUIRED_MODULES := libvtm-jni
-LOCAL_STATIC_JAVA_LIBRARIES := mapsv1
+LOCAL_SHARED_LIBRARIES := libvtm-jni
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
@@ -34,8 +33,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libvtm-jni
LOCAL_SRC_FILES := lib/$(arch)/libvtm-jni.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-include $(BUILD_PREBUILT)
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/mapsv1/Android.mk b/com.google.android.maps/Android.mk
similarity index 70%
rename from mapsv1/Android.mk
rename to com.google.android.maps/Android.mk
index 47f6ef5..65b16ec 100644
--- a/mapsv1/Android.mk
+++ b/com.google.android.maps/Android.mk
@@ -1,15 +1,18 @@
LOCAL_PATH := $(call my-dir)
+
include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps
+LOCAL_MODULE := com.google.android.maps.jar
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := com.google.android.maps.jar
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_SRC_FILES := com.google.android.maps.jar
+LOCAL_PACKAGE_NAME := com.google.android.maps.jar
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_REQUIRED_MODULES := com.google.android.maps.xml
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := com.google.android.maps.xml
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
LOCAL_SRC_FILES := com.google.android.maps.xml
diff --git a/mapsv1/com.google.android.maps.jar b/com.google.android.maps/com.google.android.maps.jar
similarity index 100%
rename from mapsv1/com.google.android.maps.jar
rename to com.google.android.maps/com.google.android.maps.jar
Binary files differ
diff --git a/mapsv1/com.google.android.maps.xml b/com.google.android.maps/com.google.android.maps.xml
similarity index 100%
rename from mapsv1/com.google.android.maps.xml
rename to com.google.android.maps/com.google.android.maps.xml