diff options
| author | Dan Albert <danalbert@google.com> | 2019-09-23 20:04:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-23 20:04:01 +0000 |
| commit | 680f6910a11c6263094bb3c10d1e7ded5827eda7 (patch) | |
| tree | 2125522efbf1ef898c7e43301f521dcf013ea1fe /build | |
| parent | 5611d64a6edc222cf7ba36b9a974fdb94cd1335a (diff) | |
| parent | 261b2a201eadab4b66ad94f3f1031bfd6bdc48cf (diff) | |
| download | ndk-680f6910a11c6263094bb3c10d1e7ded5827eda7.tar.gz | |
Merge "Fix list file path escaping for linker options."
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 |