diff options
| author | Dan Albert <danalbert@google.com> | 2019-09-20 14:56:54 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-09-20 15:01:48 -0700 |
| commit | 261b2a201eadab4b66ad94f3f1031bfd6bdc48cf (patch) | |
| tree | cec929d27b308d0d082708fc09b234d3d431b875 /build | |
| parent | 3d4e894f1a514cfbdc6444cad1758517ca17f083 (diff) | |
| download | ndk-261b2a201eadab4b66ad94f3f1031bfd6bdc48cf.tar.gz | |
Fix list file path escaping for linker options.
Test: updated the ar test to also test ld
Bug: https://github.com/android/ndk/issues/986
Change-Id: I55ad085936826b3748aae2684d9da3c6ce42640b
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/build-binary.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk index e6479cf51..2e1c0648c 100644 --- a/build/core/build-binary.mk +++ b/build/core/build-binary.mk @@ -678,7 +678,8 @@ ifeq ($(LOCAL_SHORT_COMMANDS),true) linker_options := $(linker_objects_and_libraries) linker_list_file := $(LOCAL_OBJS_DIR)/linker.list linker_objects_and_libraries := @$(call host-path,$(linker_list_file)) - $(call generate-list-file,$(linker_options),$(linker_list_file)) + $(call generate-list-file,\ + $(call escape-backslashes,$(linker_options)),$(linker_list_file)) $(LOCAL_BUILT_MODULE): $(linker_list_file) endif |