commit 8cf6b65445d721fa5c8d99ea77d9023a0104f060
author Dan Willemsen <dwillemsen@google.com> Wed Sep 05 11:01:12 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Sat Sep 15 10:52:13 2018 -0700
tree b54c85fade3545ce8a3be1cb9716dce1e558f1de
parent d55eb7643d684e01f74e580df1fdf258b6f3fc60

Remove *_OUT_INTERMEDIATE_LIBRARIES

Always use the exact libraries like Soong does instead.

Test: m
Change-Id: Ifd48020073dd045247f76f84627c497e94562286

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index a594149..42d6f76 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1480,9 +1480,9 @@
 
 ifneq ($(LOCAL_SDK_VERSION),)
 built_shared_libraries := \
-    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
-      $(addsuffix $(so_suffix), \
-        $(my_shared_libraries)))
+    $(foreach lib,$(my_shared_libraries), \
+      $(call intermediates-dir-for, \
+        SHARED_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(so_suffix))
 built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))
 
 # Add the NDK libraries to the built module dependency
@@ -1506,9 +1506,9 @@
 
 else
 built_shared_libraries := \
-    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
-      $(addsuffix $(so_suffix), \
-        $(installed_shared_library_module_names)))
+    $(foreach lib,$(installed_shared_library_module_names), \
+      $(call intermediates-dir-for, \
+        SHARED_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(so_suffix))
 built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))
 my_system_shared_libraries_fullpath :=
 endif