StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Android.bp logic from makefiles"

Browse Source
This commit is contained in:
Colin Cross
2016-07-12 16:15:53 +00:00
committed by Gerrit Code Review
parent e706372ba1 65543c7bc2
commit 8bc18d35ec
2 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/definitions.mk
View File

@@ -138,40 +138,12 @@ $(strip \
endef endef
define _filter-soong-makefile
$(if $(wildcard $(patsubst %/Android.mk,%/Android.bp,$(1))),\
$(info skipping $(1) ...)\
$(call _filter-soong-bpfile $(patsubst %/Android.mk,%/Android.bp,$(1))),\
$(1))
endef
define _filter-soong-bpfile
$(if $(wildcard $(patsubst %/Android.bp,%/Android.soong.mk,$(1))),\
$(patsubst %/Android.bp,%/Android.soong.mk,$(1)))
endef
###########################################################
## Remove any makefiles that are being handled by soong
##
## If passed an Android.mk file, returns the Android.mk file
## if no Android.bp file exists and the same path. If an
## Android.bp file exists, or if passed an Android.bp file,
## returns the Android.soong.mk file at the same path if it
## exists, or nothing if it does not.
###########################################################
define filter-soong-makefiles
$(sort $(foreach mk,$(1),\
$(if $(filter %/Android.bp,$(mk)),\
$(call _filter-soong-bpfile,$(mk)),\
$(call _filter-soong-makefile,$(mk)))))
endef
########################################################### ###########################################################
## Retrieve a list of all makefiles immediately below some directory ## Retrieve a list of all makefiles immediately below some directory
########################################################### ###########################################################
define all-makefiles-under define all-makefiles-under
$(call filter-soong-makefiles,$(wildcard $(1)/*/Android.mk $(1)/*/Android.bp)) $(wildcard $(1)/*/Android.mk)
endef endef
########################################################### ###########################################################
@@ -182,9 +154,8 @@ endef
# $(1): directory to search under # $(1): directory to search under
# Ignores $(1)/Android.mk # Ignores $(1)/Android.mk
define first-makefiles-under define first-makefiles-under
$(call filter-soong-makefiles,\
$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \ $(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \
--mindepth=2 $(addprefix --dir=,$(1)) Android.bp Android.mk)) --mindepth=2 $(addprefix --dir=,$(1)) Android.mk)
endef endef
########################################################### ###########################################################
@@ -204,9 +175,7 @@ endef
# $(1): List of directories to look for under this directory # $(1): List of directories to look for under this directory
define all-named-subdir-makefiles define all-named-subdir-makefiles
$(call filter-soong-makefiles,\ $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
$(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))\
$(wildcard $(addsuffix /Android.bp, $(addprefix $(call my-dir)/,$(1)))))
endef endef
########################################################### ###########################################################

2
core/main.mk
View File

@@ -515,7 +515,7 @@ endif
ifneq ($(ONE_SHOT_MAKEFILE),) ifneq ($(ONE_SHOT_MAKEFILE),)
# We've probably been invoked by the "mm" shell function # We've probably been invoked by the "mm" shell function
# with a subdirectory's makefile. # with a subdirectory's makefile.
include $(SOONG_ANDROID_MK) $(call filter-soong-makefiles,$(ONE_SHOT_MAKEFILE)) include $(SOONG_ANDROID_MK) $(wildcard $(ONE_SHOT_MAKEFILE))
# Change CUSTOM_MODULES to include only modules that were # Change CUSTOM_MODULES to include only modules that were
# defined by this makefile; this will install all of those # defined by this makefile; this will install all of those
# modules as a side-effect. Do this after including ONE_SHOT_MAKEFILE # modules as a side-effect. Do this after including ONE_SHOT_MAKEFILE