commit 71df05005d8cbc15b4c288ff643be243af0c7b88
author Colin Cross <ccross@android.com> Tue Feb 04 16:27:32 2014 -0800
committer Colin Cross <ccross@android.com> Thu Feb 06 18:10:45 2014 -0800
tree aa14f2cc37578469a1301c43ec13af9d4cc5d819
parent a7f99c4c0280000306e9e2c2172e48aaad51b595

libbcc: convert makefiles to support multilib build

Convert makefiles to allow for building two architectures at the
same time.

Change-Id: I13cba3766a658e332a5223ce357878b25ba8ecec

libbcc-gen-build-info.mk

diff --git a/libbcc-gen-build-info.mk b/libbcc-gen-build-info.mk
index 7112a1a..fa6a521 100644
--- a/libbcc-gen-build-info.mk
+++ b/libbcc-gen-build-info.mk
@@ -34,15 +34,15 @@
 LOCAL_LIBBCC_LIB_DEPS := \
   $(foreach lib,$(LOCAL_STATIC_LIBRARIES), \
     $(call intermediates-dir-for, \
-      STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE))/$(lib)$(a_suffix)) \
+      STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(my_2nd_arch_prefix))/$(lib)$(a_suffix)) \
   $(foreach lib,$(LOCAL_WHOLE_STATIC_LIBRARIES), \
     $(call intermediates-dir-for, \
-      STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE))/$(lib)$(a_suffix)) \
-  $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
+      STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(my_2nd_arch_prefix))/$(lib)$(a_suffix)) \
+  $(addprefix $($(my_2nd_arch_prefix)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
     $(addsuffix $(so_suffix), $(LOCAL_SHARED_LIBRARIES))) \
 
 # Build Rules for Automatically Generated Build Information
-GEN := $(local-intermediates-dir)/BuildInfo.cpp
+GEN := $(call local-intermediates-dir,,$(my_2nd_arch_prefix))/BuildInfo.cpp
 
 gen_build_info := $(LOCAL_PATH)/tools/build/gen-build-info.py
 
@@ -54,4 +54,8 @@
         $(wildcard $(LOCAL_PATH)/.git/COMMIT_EDITMSG)
 	$(transform-generated-source)
 
+ifdef LOCAL_IS_HOST_MODULE
 LOCAL_GENERATED_SOURCES += $(GEN)
+else
+LOCAL_GENERATED_SOURCES_$(TARGET_$(my_2nd_arch_prefix)ARCH) += $(GEN)
+endif