Merge \\\"Link to shared libraries with the full paths.\\\" am: b3389f4823 am: b3ef01d390

am: 50e79e1afd

Change-Id: I6a6a394ea9b5f94ed128f3369c3e1a87fccf0ea5
This commit is contained in:
Dan Albert
2016-07-27 21:36:23 +00:00
committed by android-build-merger

View File

@@ -1735,7 +1735,7 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_TARGET_LIBGCC) \
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_LDFLAGS) \
$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
$(PRIVATE_ALL_SHARED_LIBRARIES) \
-o $@ \
$(PRIVATE_TARGET_CRTEND_SO_O) \
$(PRIVATE_LDLIBS)
@@ -1823,7 +1823,7 @@ $(hide) $(PRIVATE_CXX) -pie \
$(PRIVATE_TARGET_LIBGCC) \
$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_LDFLAGS) \
$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
$(PRIVATE_ALL_SHARED_LIBRARIES) \
-o $@ \
$(PRIVATE_TARGET_CRTEND_O) \
$(PRIVATE_LDLIBS)