commit 8d9e8837b5dab9dfffff227960706436a437a33d
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 10 02:15:47 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 10 02:15:47 2020 +0000
tree f8323a88e2e99e5f6e035908ba9e76c8cca6d684
parent 4d38902967ae55f475d74f19a60148e9aa570da3
parent e8c9b7a63240721c9a0d9df0e1852f4682a72f9f

Snap for 6383144 from e8c9b7a63240721c9a0d9df0e1852f4682a72f9f to rvc-release

Change-Id: I9e580256cb1b05a900666a231c91dcb7c6cc3b54

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