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

am: b3ef01d390

Change-Id: Idb8f8089cdf6711adb9bc6f8a2f99398c58c1ebb
This commit is contained in:
Dan Albert
2016-07-27 21:33:25 +00:00
committed by android-build-merger

View File

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