Add fix for build error with MicroG

Eclipse-Community · Aug 27, 2024 · d631e2e · d631e2e
1 parent 6ccbbdf
commit d631e2e
Showing 1 changed file with 157 additions and 0 deletions.
diff --git a/patches/fix-build-error-with-microg.patch b/patches/fix-build-error-with-microg.patch
@@ -0,0 +1,157 @@
+# PWD: vendor/partner_gms
+
+diff --git a/FDroidPrivilegedExtension/Android.mk b/FDroidPrivilegedExtension/Android.mk
+index 3c0cd63..f0d864a 100644
+--- a/FDroidPrivilegedExtension/Android.mk
++++ b/FDroidPrivilegedExtension/Android.mk
+@@ -3,8 +3,9 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := privapp-permissions-org.fdroid.fdroid.privileged.xml
+ LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
++LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+ LOCAL_SRC_FILES := $(LOCAL_MODULE)
++LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+ include $(CLEAR_VARS)
+diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
+index 63907ba..2b80cfb 100644
+--- a/FakeStore/Android.mk
++++ b/FakeStore/Android.mk
+@@ -3,15 +3,9 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := privapp-permissions-com.android.vending.xml
+ LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
+-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+-include $(BUILD_PREBUILT)
+-
+-include $(CLEAR_VARS)
+-LOCAL_MODULE := default-permissions-com.android.vending.xml
+-LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/default-permissions
++LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+ LOCAL_SRC_FILES := $(LOCAL_MODULE)
++LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+ include $(CLEAR_VARS)
+@@ -21,7 +15,7 @@ LOCAL_MODULE_CLASS := APPS
+ LOCAL_PRIVILEGED_MODULE := true
+ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ LOCAL_CERTIFICATE := PRESIGNED
+-LOCAL_REQUIRED_MODULES := privapp-permissions-com.android.vending.xml default-permissions-com.android.vending.xml
++LOCAL_REQUIRED_MODULES := privapp-permissions-com.android.vending.xml
+ LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+diff --git a/FakeStore/default-permissions-com.android.vending.xml b/FakeStore/default-permissions-com.android.vending.xml
+deleted file mode 100644
+index 01f6aa2..0000000
+--- a/FakeStore/default-permissions-com.android.vending.xml
++++ /dev/null
+@@ -1,7 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<exceptions>
+-    <exception package="com.android.vending">
+-        <!-- for permissive signature spoofing, where the permission is "dangerous" -->
+-        <permission name="android.permission.FAKE_PACKAGE_SIGNATURE" fixed="false"/>
+-    </exception>
+-</exceptions>
+diff --git a/FakeStore/privapp-permissions-com.android.vending.xml b/FakeStore/privapp-permissions-com.android.vending.xml
+index 1c718df..82f0402 100644
+--- a/FakeStore/privapp-permissions-com.android.vending.xml
++++ b/FakeStore/privapp-permissions-com.android.vending.xml
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <permissions>
+     <privapp-permissions package="com.android.vending">
+-        <!-- for restrictive signature spoofing, where the permission is "signature|privileged" -->
+         <permission name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
+     </privapp-permissions>
+ </permissions>
+diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
+index 34bc76e..2595d6b 100644
+--- a/GmsCore/Android.mk
++++ b/GmsCore/Android.mk
+@@ -3,22 +3,17 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := privapp-permissions-com.google.android.gms.xml
+ LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
+-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+-include $(BUILD_PREBUILT)
+-
+-include $(CLEAR_VARS)
+-LOCAL_MODULE := default-permissions-com.google.android.gms.xml
+-LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/default-permissions
++LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+ LOCAL_SRC_FILES := $(LOCAL_MODULE)
++LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := sysconfig-com.google.android.gms.xml
+ LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/sysconfig
++LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
+ LOCAL_SRC_FILES := $(LOCAL_MODULE)
++LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+ include $(CLEAR_VARS)
+@@ -29,7 +24,7 @@ LOCAL_PRIVILEGED_MODULE := true
+ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ LOCAL_CERTIFICATE := PRESIGNED
+ LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location
+-LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml default-permissions-com.google.android.gms.xml sysconfig-com.google.android.gms.xml
++LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml sysconfig-com.google.android.gms.xml
+ # these lines will break builds before 19.1 so make them conditional
+ ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+ LOCAL_USES_LIBRARIES := com.android.location.provider
+diff --git a/GmsCore/default-permissions-com.google.android.gms.xml b/GmsCore/default-permissions-com.google.android.gms.xml
+deleted file mode 100644
+index d1d40be..0000000
+--- a/GmsCore/default-permissions-com.google.android.gms.xml
++++ /dev/null
+@@ -1,7 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<exceptions>
+-    <exception package="com.google.android.gms">
+-        <!-- for permissive signature spoofing, where the permission is "dangerous" -->
+-        <permission name="android.permission.FAKE_PACKAGE_SIGNATURE" fixed="false"/>
+-    </exception>
+-</exceptions>
+diff --git a/GmsCore/privapp-permissions-com.google.android.gms.xml b/GmsCore/privapp-permissions-com.google.android.gms.xml
+index aa04b4e..08e5958 100644
+--- a/GmsCore/privapp-permissions-com.google.android.gms.xml
++++ b/GmsCore/privapp-permissions-com.google.android.gms.xml
+@@ -1,9 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <permissions>
+     <privapp-permissions package="com.google.android.gms">
+-        <!-- for restrictive signature spoofing, where the permission is "signature|privileged" -->
+         <permission name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
+-
+         <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
+         <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+diff --git a/additional_repos.xml/Android.mk b/additional_repos.xml/Android.mk
+index 87892d4..ecaa1c6 100644
+--- a/additional_repos.xml/Android.mk
++++ b/additional_repos.xml/Android.mk
+@@ -3,7 +3,8 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := additional_repos.xml
+ LOCAL_MODULE_CLASS := ETC
+-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/org.fdroid.fdroid
++LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/org.fdroid.fdroid
+ LOCAL_SRC_FILES := additional_repos.xml
++LOCAL_PRODUCT_MODULE := true
+ include $(BUILD_PREBUILT)
+
+-- 
+2.34.1
+