StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up some kati warnings"

Browse Source 
am: 157fbf771b

Change-Id: Ib3a38e2b544900f6961c9af9d71ff1762c4fb02a
This commit is contained in:
Dan Willemsen
2018-01-30 07:48:08 +00:00
committed by android-build-merger
parent 7760fdff02 157fbf771b
commit 6432cf64b6
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/aux_config.mk
View File

@@ -102,10 +102,10 @@ $(eval include $(_path)/$(_name)$(2)) \
$(eval AUX_OS_VARIANT_LIST_$(AUX_OS_$(1)):=) \ $(eval AUX_OS_VARIANT_LIST_$(AUX_OS_$(1)):=) \
$(call aux-variant-setup-paths,$(_name)) \ $(call aux-variant-setup-paths,$(_name)) \
$(eval AUX_ALL_VARIANTS += $(_name)) \ $(eval AUX_ALL_VARIANTS += $(_name)) \
$(eval AUX_ALL_OSES := $(filterout $(AUX_OS_$(_name)),$(AUX_ALL_OSES)) $(AUX_OS_$(_name))) \ $(eval AUX_ALL_OSES := $(filter-out $(AUX_OS_$(_name)),$(AUX_ALL_OSES)) $(AUX_OS_$(_name))) \
$(eval AUX_ALL_CPUS := $(filterout $(AUX_CPU_$(_name)),$(AUX_ALL_CPUS)) $(AUX_CPU_$(_name))) \ $(eval AUX_ALL_CPUS := $(filter-out $(AUX_CPU_$(_name)),$(AUX_ALL_CPUS)) $(AUX_CPU_$(_name))) \
$(eval AUX_ALL_ARCHS := $(filterout $(AUX_ARCH_$(_name)),$(AUX_ALL_ARCHS)) $(AUX_ARCH_$(_name))) \ $(eval AUX_ALL_ARCHS := $(filter-out $(AUX_ARCH_$(_name)),$(AUX_ALL_ARCHS)) $(AUX_ARCH_$(_name))) \
$(eval AUX_ALL_SUBARCHS := $(filterout $(AUX_SUBARCH_$(_name)),$(AUX_ALL_SUBARCHS)) $(AUX_SUBARCH_$(_name))) $(eval AUX_ALL_SUBARCHS := $(filter-out $(AUX_SUBARCH_$(_name)),$(AUX_ALL_SUBARCHS)) $(AUX_SUBARCH_$(_name)))
endef endef
# Load system configuration referenced by AUX variant config; # Load system configuration referenced by AUX variant config;
@@ -138,7 +138,7 @@ define aux-variant-validate
$(eval _all:=) \ $(eval _all:=) \
$(eval _req:=$(addsuffix _$(1),$(aux_env))) \ $(eval _req:=$(addsuffix _$(1),$(aux_env))) \
$(foreach var,$(_req),$(eval _all += $(var))) \ $(foreach var,$(_req),$(eval _all += $(var))) \
$(eval _missing := $(filterout $(_all),$(_req))) \ $(eval _missing := $(filter-out $(_all),$(_req))) \
$(if $(_missing),$(error AUX variant $(1) must define vars: $(_missing))) $(if $(_missing),$(error AUX variant $(1) must define vars: $(_missing)))
endef endef

2
core/config.mk
View File

@@ -840,7 +840,7 @@ FRAMEWORK_MANIFEST_INPUT_FILES := system/libhidl/manifest.xml
ifdef DEVICE_FRAMEWORK_MANIFEST_FILE ifdef DEVICE_FRAMEWORK_MANIFEST_FILE
FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE) FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)
endif endif
$(.KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.) $(KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.)
BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt) BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)
BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt)

4
core/definitions.mk
View File

@@ -1723,6 +1723,10 @@ define delete-dummy.o-if-no-objs
$(if $(PRIVATE_ALL_OBJECTS),,$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) d $(1) $(dir $(1))dummy.o \ $(if $(PRIVATE_ALL_OBJECTS),,$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) d $(1) $(dir $(1))dummy.o \
&& rm -f $(dir $(1))dummy.o) && rm -f $(dir $(1))dummy.o)
endef endef
else
create-dummy.o-if-no-objs =
get-dummy.o-if-no-objs =
delete-dummy.o-if-no-objs =
endif # HOST_OS is darwin endif # HOST_OS is darwin
# Explicitly delete the archive first so that ar doesn't # Explicitly delete the archive first so that ar doesn't

2
core/executable_internal.mk
View File

@@ -12,7 +12,9 @@ ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),)
LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX) LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX)
endif endif
ifdef target-executable-hook
$(call target-executable-hook) $(call target-executable-hook)
endif
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE

2
core/host_executable_internal.mk
View File

@@ -12,7 +12,9 @@ ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),)
LOCAL_MODULE_SUFFIX := $($(my_prefix)EXECUTABLE_SUFFIX) LOCAL_MODULE_SUFFIX := $($(my_prefix)EXECUTABLE_SUFFIX)
endif endif
ifdef host-executable-hook
$(call host-executable-hook) $(call host-executable-hook)
endif
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE

2
core/host_shared_library_internal.mk
View File

@@ -20,7 +20,9 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),)
$(error $(LOCAL_PATH): Cannot set module stem for a library) $(error $(LOCAL_PATH): Cannot set module stem for a library)
endif endif
ifdef host-shared-library-hook
$(call host-shared-library-hook) $(call host-shared-library-hook)
endif
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE

2
core/shared_library_internal.mk
View File

@@ -20,7 +20,9 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)$(LOCAL_MODULE_STEM
$(error $(LOCAL_PATH): Cannot set module stem for a library) $(error $(LOCAL_PATH): Cannot set module stem for a library)
endif endif
ifdef target-shared-library-hook
$(call target-shared-library-hook) $(call target-shared-library-hook)
endif
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE