commit 282a64a1d7c0cee7b39bbdc1b964645b626c402f
author Cyan_Hsieh <cyanhsieh@google.com> Thu Apr 09 02:05:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 09 02:05:53 2020 +0000
tree 9c861e0f5e9faa4d7944157c5e3b59770a7e6654
parent a66621e527de216e183385f3bd73ee4a94effab7
parent e8c9b7a63240721c9a0d9df0e1852f4682a72f9f

Include Android.mk when building S5 am: e8c9b7a632

Change-Id: Idad0cd8facc9cbe37fdabda2a99e91d3bf6cd1dd

os_pickup.mk

diff --git a/os_pickup.mk b/os_pickup.mk
index b247490..59b5051 100644
--- a/os_pickup.mk
+++ b/os_pickup.mk
@@ -1,6 +1,15 @@
-ifeq ($(PRODUCT_PLATFORM),sm8150)
+ifneq ($(filter sm8150 sm7150,$(PRODUCT_PLATFORM)),)
 ifneq ($(BUILD_WITHOUT_VENDOR), true)
 LOCAL_PATH := $(call my-dir)
-include $(call first-makefiles-under,$(LOCAL_PATH))
+subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
+
+ifeq ($(PRODUCT_PLATFORM),sm7150)
+SKIP_BUILD_DIRS :=    \
+  thermal
+SKIP_MAKEFILES := $(call all-named-subdir-makefiles, $(SKIP_BUILD_DIRS))
+subdir_makefiles := $(filter-out $(SKIP_MAKEFILES), $(subdir_makefiles))
+endif
+
+$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
 endif
 endif