commit 0bf6c284e01cb67a3c7a259ded206ee0d2e1c8a3
author Kiyoung Kim <kiyoungkim@google.com> Fri Feb 02 08:06:52 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 02 08:06:57 2024 +0000
tree d843bfe399a6b9d6d01f4f6ec77c48ec3f1b9ff4
parent f4c9330e24ff8dd1935531ad2238e65d7e8b4163

Revert "Rename LOCAL_USE_VNDK"

Revert submission 2931430-local_use_vndk

Reason for revert: build fails with barbet targets

Reverted changes: /q/submissionid:2931430-local_use_vndk

Change-Id: I40277cfb26bb4da5dc398b99fc4ab009d91405fc

core/executable_internal.mk

diff --git a/core/executable_internal.mk b/core/executable_internal.mk
index fecf4f6..fb14cce 100644
--- a/core/executable_internal.mk
+++ b/core/executable_internal.mk
@@ -45,7 +45,7 @@
 my_target_crtbegin_dynamic_o :=
 my_target_crtbegin_static_o :=
 my_target_crtend_o :=
-else ifeq (true,$(call module-in-vendor-or-product))
+else ifdef LOCAL_USE_VNDK
 my_target_crtbegin_dynamic_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtbegin_dynamic.vendor)
 my_target_crtbegin_static_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtbegin_static.vendor)
 my_target_crtend_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_android.vendor)