diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/binary.mk | 2 | ||||
-rw-r--r-- | core/soong_config.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/binary.mk b/core/binary.mk index be10c2d37..df0e1a501 100644 --- a/core/binary.mk +++ b/core/binary.mk | |||
@@ -76,7 +76,7 @@ ifneq ($(NATIVE_COVERAGE),true) | |||
76 | my_native_coverage := false | 76 | my_native_coverage := false |
77 | endif | 77 | endif |
78 | 78 | ||
79 | ifeq ($(strip $(ENABLE_XOM)),true) | 79 | ifneq ($(strip $(ENABLE_XOM)),false) |
80 | ifndef LOCAL_IS_HOST_MODULE | 80 | ifndef LOCAL_IS_HOST_MODULE |
81 | my_xom := true | 81 | my_xom := true |
82 | # Disable XOM in excluded paths. | 82 | # Disable XOM in excluded paths. |
diff --git a/core/soong_config.mk b/core/soong_config.mk index 77329c35f..2363f2b16 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk | |||
@@ -83,7 +83,7 @@ $(call add_json_bool, Safestack, $(filter true,$(USE_SAF | |||
83 | $(call add_json_bool, EnableCFI, $(call invert_bool,$(filter false,$(ENABLE_CFI)))) | 83 | $(call add_json_bool, EnableCFI, $(call invert_bool,$(filter false,$(ENABLE_CFI)))) |
84 | $(call add_json_list, CFIExcludePaths, $(CFI_EXCLUDE_PATHS) $(PRODUCT_CFI_EXCLUDE_PATHS)) | 84 | $(call add_json_list, CFIExcludePaths, $(CFI_EXCLUDE_PATHS) $(PRODUCT_CFI_EXCLUDE_PATHS)) |
85 | $(call add_json_list, CFIIncludePaths, $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS)) | 85 | $(call add_json_list, CFIIncludePaths, $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS)) |
86 | $(call add_json_bool, EnableXOM, $(filter true,$(ENABLE_XOM))) | 86 | $(call add_json_bool, EnableXOM, $(call invert_bool,$(filter false,$(ENABLE_XOM)))) |
87 | $(call add_json_list, XOMExcludePaths, $(XOM_EXCLUDE_PATHS) $(PRODUCT_XOM_EXCLUDE_PATHS)) | 87 | $(call add_json_list, XOMExcludePaths, $(XOM_EXCLUDE_PATHS) $(PRODUCT_XOM_EXCLUDE_PATHS)) |
88 | $(call add_json_list, IntegerOverflowExcludePaths, $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS)) | 88 | $(call add_json_list, IntegerOverflowExcludePaths, $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS)) |
89 | 89 | ||