diff options
| author | Ying Wang <wangying@google.com> | 2012-09-25 18:32:24 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-10-10 10:25:13 -0700 |
| commit | 2c287e9510ec1d379b3cd779651b595dafb6a2ff (patch) | |
| tree | dcadea1e046ac714bacb64a4a85c687742915834 /linker | |
| parent | 3ef4fecd30c22f3c17c1dadfce4527e858b42e7e (diff) | |
| download | bionic-2c287e9510ec1d379b3cd779651b595dafb6a2ff.zip bionic-2c287e9510ec1d379b3cd779651b595dafb6a2ff.tar.gz bionic-2c287e9510ec1d379b3cd779651b595dafb6a2ff.tar.bz2 | |
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
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 99618f5..e8c81db 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) ($@)" |