commit 4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae
author Ying Wang <wangying@google.com> Thu Jan 16 12:36:34 2014 -0800
committer Ying Wang <wangying@google.com> Fri Jan 24 13:35:30 2014 -0800
tree 6634db5eaa47f605d43d106db5201a122440f8a4
parent 6ef6519170742bf3d56e17d04194e9cb0ecdead7

Set up rules to build shared libraries for TARGET_2ND_ARCH

The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 37bdc32..96ff445 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1280,13 +1280,7 @@
 define transform-o-to-shared-lib
 @mkdir -p $(dir $@)
 @echo "target SharedLib: $(PRIVATE_MODULE) ($@)"
-$(transform-o-to-shared-lib-inner)
-endef
-
-define transform-o-to-package
-@mkdir -p $(dir $@)
-@echo "target Package: $(PRIVATE_MODULE) ($@)"
-$(transform-o-to-shared-lib-inner)
+$($(PRIVATE_2ND_ARCH_VAR_PREFIX)transform-o-to-shared-lib-inner)
 endef
 
 
@@ -1297,7 +1291,7 @@
 define transform-to-stripped
 @mkdir -p $(dir $@)
 @echo "target Strip: $(PRIVATE_MODULE) ($@)"
-$(hide) $(TARGET_STRIP_COMMAND)
+$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_STRIP_COMMAND)
 endef