Fix mapsv1

GmsCore/Android.mk

@@ -3,8 +3,7 @@ include $(CLEAR_VARS)
 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 @@ endif
 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)
 

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