diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-02 18:42:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 18:42:26 +0000 |
| commit | 7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9 (patch) | |
| tree | 953d2e8153f6524521db71dbaf1440118249a022 | |
| parent | 4bad2d2156bcb589c2d1bb223a074edc39aa428c (diff) | |
| parent | 86e6b7ed51dab3ec92b83d25eabe4409035a8b9a (diff) | |
| download | build-7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9.zip build-7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9.tar.gz build-7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9.tar.bz2 | |
Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/raw_executable.mk | 25 | ||||
| -rw-r--r-- | core/raw_static_library.mk | 4 |
3 files changed, 0 insertions, 31 deletions
diff --git a/core/config.mk b/core/config.mk index c9453ef..f51a29a 100644 --- a/core/config.mk +++ b/core/config.mk @@ -69,10 +69,8 @@ CLEAR_VARS:= $(BUILD_SYSTEM)/clear_vars.mk BUILD_HOST_STATIC_LIBRARY:= $(BUILD_SYSTEM)/host_static_library.mk BUILD_HOST_SHARED_LIBRARY:= $(BUILD_SYSTEM)/host_shared_library.mk BUILD_STATIC_LIBRARY:= $(BUILD_SYSTEM)/static_library.mk -BUILD_RAW_STATIC_LIBRARY := $(BUILD_SYSTEM)/raw_static_library.mk BUILD_SHARED_LIBRARY:= $(BUILD_SYSTEM)/shared_library.mk BUILD_EXECUTABLE:= $(BUILD_SYSTEM)/executable.mk -BUILD_RAW_EXECUTABLE:= $(BUILD_SYSTEM)/raw_executable.mk BUILD_HOST_EXECUTABLE:= $(BUILD_SYSTEM)/host_executable.mk BUILD_PACKAGE:= $(BUILD_SYSTEM)/package.mk BUILD_PHONY_PACKAGE:= $(BUILD_SYSTEM)/phony_package.mk diff --git a/core/raw_executable.mk b/core/raw_executable.mk deleted file mode 100644 index b64173a..0000000 --- a/core/raw_executable.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_SUFFIX := -LOCAL_FORCE_STATIC_EXECUTABLE := true - -include $(BUILD_SYSTEM)/binary.mk - -$(LOCAL_BUILT_MODULE) : PRIVATE_ELF_FILE := $(intermediates)/$(PRIVATE_MODULE).elf -$(LOCAL_BUILT_MODULE) : PRIVATE_LIBS := `$(TARGET_CC) -mthumb-interwork -print-libgcc-file-name` - -$(all_objects) : PRIVATE_TARGET_PROJECT_INCLUDES := -$(all_objects) : PRIVATE_TARGET_C_INCLUDES := -$(all_objects) : PRIVATE_TARGET_GLOBAL_CFLAGS := -$(all_objects) : PRIVATE_TARGET_GLOBAL_CPPFLAGS := - -$(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) - @$(mkdir -p $(dir $@) - @echo "target Linking: $(PRIVATE_MODULE)" - $(hide) $(TARGET_LD) \ - $(addprefix --script ,$(PRIVATE_LINK_SCRIPT)) \ - $(PRIVATE_RAW_EXECUTABLE_LDFLAGS) \ - -o $(PRIVATE_ELF_FILE) \ - $(PRIVATE_ALL_OBJECTS) \ - --start-group $(PRIVATE_ALL_STATIC_LIBRARIES) --end-group \ - $(PRIVATE_LIBS) - $(hide) $(TARGET_OBJCOPY) -O binary $(PRIVATE_ELF_FILE) $@ diff --git a/core/raw_static_library.mk b/core/raw_static_library.mk deleted file mode 100644 index 14a404d..0000000 --- a/core/raw_static_library.mk +++ /dev/null @@ -1,4 +0,0 @@ - -LOCAL_RAW_STATIC_LIBRARY:=true - -include $(BUILD_SYSTEM)/static_library_internal.mk |