From 384cdac7930e7a2b67fd287cfae943fdaf7e5ca3 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Tue, 2 Jul 2019 15:58:26 +0800 Subject: [PATCH 1/2] Only include Android.mk of selected gapps Some apps don't exist in all archs. Only include makefiles of selected apps to avoid such errors: [570/645] including vendor/opengapps/build/modules/ActionsServices/Android.mk ... error: ActionsServices: No source files specified --- modules/Android.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 modules/Android.mk diff --git a/modules/Android.mk b/modules/Android.mk new file mode 100644 index 0000000..03d69cf --- /dev/null +++ b/modules/Android.mk @@ -0,0 +1 @@ +include $(call all-named-subdir-makefiles,$(GAPPS_PRODUCT_PACKAGES)) From 3bb6f0804fe5d516b6b0bc68d8a45a2e57f147d5 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Tue, 2 Jul 2019 16:15:00 +0800 Subject: [PATCH 2/2] Remove all apps before including opengapps To avoid conflicts between opengapps and AOSP's default apps. Note the clean steps are only executed once. --- CleanSpec.mk | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CleanSpec.mk diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..50b8df1 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,2 @@ +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*)