From 2c287e9510ec1d379b3cd779651b595dafb6a2ff Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 25 Sep 2012 18:32:24 -0700 Subject: [PATCH] Set up the private variables. Now we use private variables in transform-o-to-executable to support build executables against the NDK. Cherry-picked from master. Bug: 7170098 Change-Id: Ic8f1d36a116fce24f3ea6a3ff5e9bfab6cafee99 --- linker/Android.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linker/Android.mk b/linker/Android.mk index 99618f591..e8c81db1c 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -68,6 +68,14 @@ LOCAL_NO_CRT := true include $(BUILD_SYSTEM)/dynamic_binary.mk +# See build/core/executable.mk +$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(TARGET_GLOBAL_LD_DIRS) +$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(TARGET_GLOBAL_LDFLAGS) +$(linked_module): PRIVATE_TARGET_FDO_LIB := $(TARGET_FDO_LIB) +$(linked_module): PRIVATE_TARGET_LIBGCC := $(TARGET_LIBGCC) +$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_CRTBEGIN_DYNAMIC_O) +$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(TARGET_CRTBEGIN_STATIC_O) +$(linked_module): PRIVATE_TARGET_CRTEND_O := $(TARGET_CRTEND_O) $(linked_module): $(TARGET_CRTBEGIN_STATIC_O) $(all_objects) $(all_libraries) $(TARGET_CRTEND_O) $(transform-o-to-static-executable) @echo "target PrefixSymbols: $(PRIVATE_MODULE) ($@)"