diff options
-rw-r--r-- | core/binary.mk | 4 | ||||
-rw-r--r-- | core/combo/HOST_darwin-x86.mk | 2 | ||||
-rw-r--r-- | core/definitions.mk | 2 | ||||
-rw-r--r-- | core/host_shared_library.mk | 2 | ||||
-rw-r--r-- | core/host_static_library.mk | 2 | ||||
-rw-r--r-- | core/product_config.mk | 2 | ||||
-rw-r--r-- | core/shared_library.mk | 2 | ||||
-rw-r--r-- | core/static_library.mk | 2 | ||||
-rw-r--r-- | core/tasks/factory_ramdisk.mk | 2 | ||||
-rw-r--r-- | core/tasks/vendor_module_check.mk | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/core/binary.mk b/core/binary.mk index e10ec9c..ce0fd70 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -11,7 +11,7 @@ ifdef LOCAL_SDK_VERSION $(error $(LOCAL_PATH): LOCAL_NDK_VERSION is now retired.) endif ifdef LOCAL_IS_HOST_MODULE - $(error $(LOCAL_PATH): LOCAL_SDK_VERSION can not be used in host module) + $(error $(LOCAL_PATH): LOCAL_SDK_VERSION cannot be used in host module) endif ifneq ($(filter-out SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),) $(error $(LOCAL_PATH): NDK can only be used to build target shared/static libraries, \ @@ -98,7 +98,7 @@ endif ifdef LOCAL_SDK_VERSION # Get the list of INSTALLED libraries as module names. - # We can not compute the full path of the LOCAL_SHARED_LIBRARIES for + # We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for # they may cusomize their install path with LOCAL_MODULE_PATH installed_shared_library_module_names := \ $(LOCAL_SHARED_LIBRARIES) diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index d05406c..5b9f8f3 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -60,7 +60,7 @@ endif ifeq ($(wildcard $(mac_sdk_root)),) $(warning *****************************************************) -$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) +$(warning * Cannot find SDK $(mac_sdk_version) at $(mac_sdk_root)) ifeq ($(strip $(BUILD_MAC_SDK_EXPERIMENTAL)),) $(warning * If you wish to build using higher version of SDK, ) $(warning * try setting BUILD_MAC_SDK_EXPERIMENTAL=1 before ) diff --git a/core/definitions.mk b/core/definitions.mk index 12dce3d..5600779 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1768,7 +1768,7 @@ endef # Copy a single file from one place to another, # preserving permissions and overwriting any existing # file. -# We disable the "-t" option for acp can not handle +# We disable the "-t" option for acp cannot handle # high resolution timestamp correctly on file systems like ext4. # Therefore copy-file-to-target is the same as copy-file-to-new-target. define copy-file-to-target diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index 976a942..65e8258 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -19,7 +19,7 @@ ifneq ($(strip $(OVERRIDE_BUILT_MODULE_PATH)),) $(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH) endif ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) -$(error $(LOCAL_PATH): Can not set module stem for a library) +$(error $(LOCAL_PATH): Cannot set module stem for a library) endif # Put the built modules of all shared libraries in a common directory diff --git a/core/host_static_library.mk b/core/host_static_library.mk index b04291b..a533cf5 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),) LOCAL_MODULE_SUFFIX := .a endif ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) -$(error $(LOCAL_PATH): Can not set module stem for a library) +$(error $(LOCAL_PATH): Cannot set module stem for a library) endif LOCAL_UNINSTALLABLE_MODULE := true diff --git a/core/product_config.mk b/core/product_config.mk index e05907d..75df954 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 Can not locate config makefile for product "$(TARGET_PRODUCT)") +$(error Cannot locate config makefile for product "$(TARGET_PRODUCT)") endif ifneq (1,$(words $(current_product_makefile))) $(error Product "$(TARGET_PRODUCT)" ambiguous: matches $(current_product_makefile)) diff --git a/core/shared_library.mk b/core/shared_library.mk index 122cd29..97442f7 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -17,7 +17,7 @@ ifneq ($(strip $(OVERRIDE_BUILT_MODULE_PATH)),) $(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH) endif ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) -$(error $(LOCAL_PATH): Can not set module stem for a library) +$(error $(LOCAL_PATH): Cannot set module stem for a library) endif #################################################### diff --git a/core/static_library.mk b/core/static_library.mk index 2a8edfd..976963e 100644 --- a/core/static_library.mk +++ b/core/static_library.mk @@ -15,7 +15,7 @@ LOCAL_MODULE_SUFFIX := .a endif LOCAL_UNINSTALLABLE_MODULE := true ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) -$(error $(LOCAL_PATH): Can not set module stem for a library) +$(error $(LOCAL_PATH): Cannot set module stem for a library) endif #################################################### diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index 05d89b0..38a5887 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -40,7 +40,7 @@ $(if $(filter 1,$(words $(_iofrm_src))), \ $(eval _fulldest := $(TARGET_FACTORY_RAMDISK_OUT)/$(1)) \ $(eval $(call copy-one-file,$(_iofrm_src),$(_fulldest))) \ $(eval INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES += $(_fulldest)), \ - $(error Error: Can not find match in "$(2)" for "$(1)") \ + $(error Error: Cannot find match in "$(2)" for "$(1)") \ ) endef diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk index cbee384..2b10d1d 100644 --- a/core/tasks/vendor_module_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -44,7 +44,7 @@ $(call expand-required-modules,_vendor_check_modules,$(_vendor_check_modules)) ifneq (,$(filter true owner all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES))) ifneq (,$(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))) -$(error Error: Product "$(TARGET_PRODUCT)" can not have overlay in vendor tree: \ +$(error Error: Product "$(TARGET_PRODUCT)" cannot have overlay in vendor tree: \ $(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))) endif _vendor_check_copy_files := $(filter vendor/%, $(PRODUCT_COPY_FILES)) |