commit 635733b816f5b5d72c890523e9655493e0d367f6
author Colin Cross <ccross@android.com> Mon Sep 10 21:35:55 2018 +0000
committer Colin Cross <ccross@android.com> Mon Sep 10 21:35:55 2018 +0000
tree faadda49d92fa8f79ec36a82aa6e1c4974b7240f
parent 1bb943b97c0d1a35032369b39fc007e3b11be4fa

Revert "Add soong_cc_prebuilt.mk"

This reverts commit 1bb943b97c0d1a35032369b39fc007e3b11be4fa.

Reason for revert: broke mac builds
Bug: 113936524

Change-Id: I5b3d8eb1314eb322a5f9c578623ac89e2ad25706

core/header_library_internal.mk

diff --git a/core/header_library_internal.mk b/core/header_library_internal.mk
index 35ee1bc..3e4958f 100644
--- a/core/header_library_internal.mk
+++ b/core/header_library_internal.mk
@@ -11,6 +11,16 @@
 $(error $(LOCAL_PATH): Cannot set module stem for a library)
 endif
 
+ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
+  ifdef LOCAL_USE_VNDK
+    name_without_suffix := $(patsubst %.vendor,%,$(LOCAL_MODULE))
+    ifneq ($(name_without_suffix),$(LOCAL_MODULE))
+      SPLIT_VENDOR.$(LOCAL_MODULE_CLASS).$(name_without_suffix) := 1
+    endif
+    name_without_suffix :=
+  endif
+endif
+
 include $(BUILD_SYSTEM)/binary.mk
 
 ifneq ($(strip $(all_objects)),)