Only include Android.mk of selected gapps #222
Conversation
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
To avoid conflicts between opengapps and AOSP's default apps. Note the clean steps are only executed once.
| @@ -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/*) | |||
There was a problem hiding this comment.
these clean rules seem too broad.
what is the use-case where they are needed?
if you already have an aosp build completed and then decide to add opengapps to your build, then I think you can just run make installclean and the system-app and system-priv-app will be cleaned up.
There was a problem hiding this comment.
The use-case: make an incremental build after adding repos of opengapps
Of course manually doing make installclean would solve that.
But the CleanStep.mk is faster and smarter. It just removes apps in /system instead of whole /system. Besides, people usually forget them need to do so (after adding opengapps) that results in a broken build. The CleanStep.mk automates it.
Note this is the standard way to handle such a problem in AOSP build system.
AOSP often adds new clean steps. For example, see
cd build/make; git log CleanSpec.mk
| @@ -0,0 +1 @@ | |||
| include $(call all-named-subdir-makefiles,$(GAPPS_PRODUCT_PACKAGES)) | |||
There was a problem hiding this comment.
this requires that the module names exactly match the directory names. I think this true now, although it wasn't always like that.
|
It looks like you are building for x86 or x86_64. You can work-around errors like this using GAPPS_EXCLUDED_PACKAGES: GAPPS_EXCLUDED_PACKAGES += ActionsServicesIf the apk really does not exist for x86, x86_64, then a better fix is to update the logic in |
|
OK, agree. Then could you fix that? Since you are more familiar with what apps don't exist for x86/ x86_64. I just invent a quick and lazy way to work around it... |
|
This should work: $ git diff
diff --git a/modules/ActionsServices/Android.mk b/modules/ActionsServices/Android.mk
index 94ff562..8b5fcb5 100644
--- a/modules/ActionsServices/Android.mk
+++ b/modules/ActionsServices/Android.mk
@@ -1,3 +1,4 @@
+ifneq ($(filter arm64 arm, $(TARGET_ARCH)),)
LOCAL_PATH := .
include $(CLEAR_VARS)
include $(GAPPS_CLEAR_VARS)
@@ -5,3 +6,4 @@ LOCAL_MODULE := ActionsServices
LOCAL_PACKAGE_NAME := com.google.android.as
include $(BUILD_GAPPS_PREBUILT_APK)
+endifCould you try this and let me know? I actually stopped using |
|
@stefanhh0 This explains my build issue! (re discussion here: f8bd617#comments) I have because there is no ActionsServices blob for all, x86 or x86_64 Why are Android.mk files being included for packages in |
|
@greyltc This error commonly occurs when Android parses these build files in sorted order (which is why Despite github being utterly broken when searching for |
|
A lot of people are having trouble with git lfs and so this issue is getting conflated with those, I'm not having any issues with git lfs pull: $ zipinfo vendor/opengapps/sources/x86_64/app/com.google.android.webview/21/nodpi/398716260.apk | head -n 10
Archive: vendor/opengapps/sources/x86_64/app/com.google.android.webview/21/nodpi/398716260.apk
Zip file size: 72940880 bytes, number of entries: 506
-rw---- 1.0 fat 22031 bx stor 09-Jan-01 00:00 assets/chrome_100_percent.pak
-rw---- 1.0 fat 6412768 bx stor 09-Jan-01 00:00 assets/icudtl.dat
-rw---- 1.0 fat 409736 bx stor 09-Jan-01 00:00 assets/resources.pak
-rw---- 1.0 fat 237188 bx stor 09-Jan-01 00:00 assets/snapshot_blob_32.bin
-rw---- 1.0 fat 240440 bx stor 09-Jan-01 00:00 assets/snapshot_blob_64.bin
-rw---- 1.0 fat 16049 bx stor 09-Jan-01 00:00 assets/stored-locales/am.pak
-rw---- 1.0 fat 14429 bx stor 09-Jan-01 00:00 assets/stored-locales/ar.pak
-rw---- 1.0 fat 17945 bx stor 09-Jan-01 00:00 assets/stored-locales/bg.pak
Last time I checked (30 seconds ago), the ActionsServices blob is not available for |
|
@greyltc Thanks for the heads-up, that's the topic of this PR which I completely ignored. The suggestion by @jamuir is the way to go, IMO. |
|
I've applied @jamuir's suggestion but I still have this issue... I disagree that his is the right approach though. Why should we be hardcoding archetecture depencancies into the Android.mk files? What if I'm going to try @cwhuang's PR here now to see if my build can complete with that... |
|
Yep. I can confirm that my problem is solved today by: I suggest you folks merge this PR! 👍 |
|
Desync between The same will happen with this PR, except that the An alternative solution has been discussed here which prevents the module from being added to the build-system altogether if the file is not found. That in turn relies on the build system to complain (or silently continue) when a missing module is specified in |
|
Yeah, I can imagine the dependancy problem is not a simple one and there's a ton of intricacies I'm not familar with here. Anyway, now you all are aware that x86_64 builds are broken and this PR solves that for me. Unfortunately, it looks like jamuir's suggestion above does not solve that for me (for whatever reason, I'd guess that's somehow related to cwhuang's
|
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