Fix makefile generation for apk targets

* I don't even know

Change-Id: I173566d54e0088b273f6747b5b7e8455cd04d0bb
Signed-off-by: Paul Keith <[email protected]>

arm/Android.mk

@@ -21,7 +21,7 @@ ifneq ($(filter arm,$(TARGET_ARCH)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/PrebuiltGmsCore/PrebuiltGmsCore.apk
+LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS

arm64/Android.mk

@@ -21,7 +21,7 @@ ifneq ($(filter arm64,$(TARGET_ARCH)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/PrebuiltGmsCore/PrebuiltGmsCore.apk
+LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS

common/Android.mk

@@ -21,7 +21,7 @@ ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleContactsSyncAdapter
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+LOCAL_SRC_FILES := proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -32,7 +32,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleExtShared
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleExtShared/GoogleExtShared.apk
+LOCAL_SRC_FILES := proprietary/app/GoogleExtShared/GoogleExtShared.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -43,7 +43,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleBackupTransport
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleBackupTransport/GoogleBackupTransport.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -55,7 +55,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleExtServices
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleExtServices/GoogleExtServices.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -67,7 +67,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleFeedback
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleFeedback/GoogleFeedback.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -79,7 +79,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleLoginService
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleLoginService/GoogleLoginService.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -91,7 +91,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleOneTimeInitializer
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -103,7 +103,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GooglePartnerSetup
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GooglePartnerSetup/GooglePartnerSetup.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -115,7 +115,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleServicesFramework
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/GoogleServicesFramework/GoogleServicesFramework.apk
+LOCAL_SRC_FILES := proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -127,7 +127,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := HotwordEnrollment
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/HotwordEnrollment/HotwordEnrollment.apk
+LOCAL_SRC_FILES := proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -139,7 +139,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := Phonesky
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/Phonesky/Phonesky.apk
+LOCAL_SRC_FILES := proprietary/priv-app/Phonesky/Phonesky.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
@@ -151,7 +151,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := SetupWizard
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/SetupWizard/SetupWizard.apk
+LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS

proprietary-files-arm.txt

@@ -1,2 +1,2 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|df53a2657634ac197c78595f6a0f5ec3081ceed1
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|df53a2657634ac197c78595f6a0f5ec3081ceed1
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e

proprietary-files-arm64.txt

@@ -1,3 +1,3 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|9a2bf96c5c171dfb8aa1726a5a21bc096f73c84e
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|9a2bf96c5c171dfb8aa1726a5a21bc096f73c84e
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
 lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d

proprietary-files-common.txt

@@ -1,16 +1,16 @@
--app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:PRESIGNED
--app/GoogleExtShared/GoogleExtShared.apk:PRESIGNED
+-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:PRESIGNED
+-app/GoogleExtShared/GoogleExtShared.apk:app/GoogleExtShared/GoogleExtShared.apk:PRESIGNED
 
--priv-app/GoogleBackupTransport/GoogleBackupTransport.apk:PRESIGNED
--priv-app/GoogleExtServices/GoogleExtServices.apk:PRESIGNED
--priv-app/GoogleFeedback/GoogleFeedback.apk:PRESIGNED
--priv-app/GoogleLoginService/GoogleLoginService.apk:PRESIGNED
--priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:PRESIGNED
--priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
--priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
--priv-app/HotwordEnrollment/HotwordEnrollment.apk:PRESIGNED
--priv-app/Phonesky/Phonesky.apk:PRESIGNED
--priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
+-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk:priv-app/GoogleBackupTransport/GoogleBackupTransport.apk::PRESIGNED
+-priv-app/GoogleExtServices/GoogleExtServices.apk:priv-app/GoogleExtServices/GoogleExtServices.apk:PRESIGNED
+-priv-app/GoogleFeedback/GoogleFeedback.apk:priv-app/GoogleFeedback/GoogleFeedback.apk:PRESIGNED
+-priv-app/GoogleLoginService/GoogleLoginService.apk:priv-app/GoogleLoginService/GoogleLoginService.apk:PRESIGNED
+-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:PRESIGNED
+-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
+-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
+-priv-app/HotwordEnrollment/HotwordEnrollment.apk:priv-app/HotwordEnrollment/HotwordEnrollment.apk:PRESIGNED
+-priv-app/Phonesky/Phonesky.apk:priv-app/Phonesky/Phonesky.apk:PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk:priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
 
 -framework/com.google.android.maps.jar:PRESIGNED
 -framework/com.google.android.media.effects.jar:PRESIGNED

proprietary-files-x86.txt

@@ -1,2 +1,2 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|e37f94a30b762ee2dd47dd0f22808bfacf176dbe
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|e37f94a30b762ee2dd47dd0f22808bfacf176dbe
 lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79

x86/Android.mk

@@ -21,7 +21,7 @@ ifneq ($(filter x86,$(TARGET_ARCH)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
 LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/PrebuiltGmsCore/PrebuiltGmsCore.apk
+LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS