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

Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 am: 55b1651181

Browse Source 
am: 35ab684f8e

Change-Id: If0557ff6e3dcb44335ab781bec929846fbdf82a9
This commit is contained in:
Dan Willemsen
2016-12-06 02:37:58 +00:00
committed by android-build-merger
parent 1aab680f2f 35ab684f8e
commit 5b8f1db905
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/binary.mk
View File

@@ -835,7 +835,6 @@ endif
########################################################### ###########################################################
proto_sources := $(filter %.proto,$(my_src_files)) proto_sources := $(filter %.proto,$(my_src_files))
ifneq ($(proto_sources),) ifneq ($(proto_sources),)
my_soong_problems += proto
proto_gen_dir := $(generated_sources_dir)/proto proto_gen_dir := $(generated_sources_dir)/proto
proto_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(proto_sources)) proto_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(proto_sources))
@@ -974,7 +973,6 @@ endif # $(dbus_definitions) non-empty
aidl_src := $(strip $(filter %.aidl,$(my_src_files))) aidl_src := $(strip $(filter %.aidl,$(my_src_files)))
aidl_gen_cpp := aidl_gen_cpp :=
ifneq ($(aidl_src),) ifneq ($(aidl_src),)
my_soong_problems += aidl
# Use the intermediates directory to avoid writing our own .cpp -> .o rules. # Use the intermediates directory to avoid writing our own .cpp -> .o rules.
aidl_gen_cpp_root := $(intermediates)/aidl-generated/src aidl_gen_cpp_root := $(intermediates)/aidl-generated/src
@@ -1286,7 +1284,6 @@ objcpp_objects := $(addprefix $(intermediates)/,$(objcpp_sources:.mm=.o))
$(call track-src-file-obj,$(objcpp_sources),$(objcpp_objects)) $(call track-src-file-obj,$(objcpp_sources),$(objcpp_objects))
ifneq ($(strip $(objcpp_objects)),) ifneq ($(strip $(objcpp_objects)),)
my_soong_problems += objc
$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm \ $(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm \
$(my_additional_dependencies) $(my_additional_dependencies)
$(transform-$(PRIVATE_HOST)mm-to-o) $(transform-$(PRIVATE_HOST)mm-to-o)