commit 8bc18d35ec8bc892b32a726a75ea979cf357245a
author Colin Cross <ccross@android.com> Tue Jul 12 16:15:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 12 16:15:55 2016 +0000
tree adf428e6355fa1f87fd68f0d695a6e926eda9b70
parent e706372ba140921e3b486477b9d115d0028eb121
parent 65543c7bc2bfb5b9de0b52a9568fec5d9ae93ff7

Merge "Remove Android.bp logic from makefiles"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 5194918..11caedf 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -138,40 +138,12 @@
 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
 ###########################################################
 
 define all-makefiles-under
-$(call filter-soong-makefiles,$(wildcard $(1)/*/Android.mk $(1)/*/Android.bp))
+$(wildcard $(1)/*/Android.mk)
 endef
 
 ###########################################################
@@ -182,9 +154,8 @@
 # $(1): directory to search under
 # Ignores $(1)/Android.mk
 define first-makefiles-under
-$(call filter-soong-makefiles,\
-  $(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \
-        --mindepth=2 $(addprefix --dir=,$(1)) Android.bp Android.mk))
+$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \
+        --mindepth=2 $(addprefix --dir=,$(1)) Android.mk)
 endef
 
 ###########################################################
@@ -204,9 +175,7 @@
 
 # $(1): List of directories to look for under this directory
 define all-named-subdir-makefiles
-$(call filter-soong-makefiles,\
-  $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))\
-  $(wildcard $(addsuffix /Android.bp, $(addprefix $(call my-dir)/,$(1)))))
+$(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
 endef
 
 ###########################################################

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a2f80ef..b99de49 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -515,7 +515,7 @@
 ifneq ($(ONE_SHOT_MAKEFILE),)
 # We've probably been invoked by the "mm" shell function
 # 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
 # defined by this makefile; this will install all of those
 # modules as a side-effect.  Do this after including ONE_SHOT_MAKEFILE