diff options
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 4 | ||||
| -rw-r--r-- | core/definitions.mk | 18 | ||||
| -rw-r--r-- | core/main.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 7c7a9ef..b2b006a 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -81,7 +81,7 @@ endif TARGET_GLOBAL_CFLAGS += \ $(TARGET_mips_CFLAGS) \ -Ulinux -U__unix -U__unix__ -Umips \ - -fpic \ + -fpic -fPIE\ -ffunction-sections \ -fdata-sections \ -funwind-tables \ @@ -243,7 +243,7 @@ $(hide) $(PRIVATE_CXX) \ endef define transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic \ +$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ -Wl,-dynamic-linker,/system/bin/linker \ -Wl,--gc-sections \ -Wl,-z,nocopyreloc \ diff --git a/core/definitions.mk b/core/definitions.mk index 06db960..3ae56aa 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -178,7 +178,7 @@ endef define all-java-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.java" -and -not -name ".*") \ + find -L $(1) -name "*.java" -and -not -name ".*") \ ) endef @@ -200,7 +200,7 @@ endef define all-c-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.c" -and -not -name ".*") \ + find -L $(1) -name "*.c" -and -not -name ".*") \ ) endef @@ -222,7 +222,7 @@ endef define all-Iaidl-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "I*.aidl" -and -not -name ".*") \ + find -L $(1) -name "I*.aidl" -and -not -name ".*") \ ) endef @@ -243,7 +243,7 @@ endef define all-logtags-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.logtags" -and -not -name ".*") \ + find -L $(1) -name "*.logtags" -and -not -name ".*") \ ) endef @@ -256,7 +256,7 @@ endef define all-proto-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.proto" -and -not -name ".*") \ + find -L $(1) -name "*.proto" -and -not -name ".*") \ ) endef @@ -269,7 +269,7 @@ endef define all-renderscript-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \ + find -L $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \ ) endef @@ -282,7 +282,7 @@ endef define all-html-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.html" -and -not -name ".*") \ + find -L $(1) -name "*.html" -and -not -name ".*") \ ) endef @@ -301,7 +301,7 @@ endef ########################################################### define find-subdir-files -$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) ; find $(1))) +$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) ; find -L $(1))) endef ########################################################### @@ -314,7 +314,7 @@ endef define find-subdir-subdir-files $(filter-out $(patsubst %,$(1)/%,$(3)),$(patsubst ./%,%,$(shell cd \ - $(LOCAL_PATH) ; find $(1) -maxdepth 1 -name $(2)))) + $(LOCAL_PATH) ; find -L $(1) -maxdepth 1 -name $(2)))) endef ########################################################### diff --git a/core/main.mk b/core/main.mk index 87488f4..ffc1501 100644 --- a/core/main.mk +++ b/core/main.mk @@ -738,7 +738,6 @@ $(ALL_C_CPP_ETC_OBJECTS): | all_copied_headers .PHONY: files files: prebuilt \ $(modules_to_install) \ - $(modules_to_check) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) # ------------------------------------------------------------------- diff --git a/core/product_config.mk b/core/product_config.mk index 75df954..e05907d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -220,7 +220,7 @@ $(call import-products, $(all_product_makefiles)) else # Import just the current product. ifndef current_product_makefile -$(error Cannot locate config makefile for product "$(TARGET_PRODUCT)") +$(error Can not locate config makefile for product "$(TARGET_PRODUCT)") endif ifneq (1,$(words $(current_product_makefile))) $(error Product "$(TARGET_PRODUCT)" ambiguous: matches $(current_product_makefile)) |