Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only include Android.mk of selected gapps #222

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Only include Android.mk of selected gapps #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
384cdac
Only include Android.mk of selected gapps
cwhuang Jul 2, 2019
3bb6f08
Remove all apps before including opengapps
cwhuang Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CleanSpec.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/*)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

1 change: 1 addition & 0 deletions modules/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include $(call all-named-subdir-makefiles,$(GAPPS_PRODUCT_PACKAGES))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this requires that the module names exactly match the directory names. I think this true now, although it wasn't always like that.