Add extra libgcc.a only for unbundled build.

We can save some space for platform build with this.
Previously an extra libgcc.a was put before libc.so so libraries built
against new platform can run on old platforms. This is needed only for
unbundled build.

Bug: 8805022
Bug: 8247455

Change-Id: I3c3e0092b06ec3804659d5cae048d29e0d2bf7ad

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 24d57b2..371ba96 100644 (file)
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -244,7 +244,7 @@ $(hide) $(PRIVATE_CXX) \
        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
        $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
-       $(PRIVATE_TARGET_LIBGCC) \
+       $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \
        $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
        -o $@ \
        $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -269,7 +269,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
        $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
-       $(PRIVATE_TARGET_LIBGCC) \
+       $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \
        $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
        -o $@ \
        $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \