Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8cb1954 authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Add -CROSS suffix to cross host OS notice targets. 

This fixes a bug where cross host OS notice dependecies were incorrectly
added and caused missing file errors.

Bug: 36073965
Test: Manual build + inspection
Change-Id: I3983ad6158acf939842f836fe3f44cecf9187087
parent c21c709f

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ built_whole_libraries := \ 
ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(my_static_libraries) $(my_whole_static_libraries), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-STATIC_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif

core/java_common.mk

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ 
ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-JAVA_LIBRARIES-$(lib))

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-JAVA_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif

core/notice_files.mk

+1 −1
Original line number Diff line number Diff line
@@ -119,6 +119,6 @@ endif 
# Define it even if the notice file doesn't exist so that other

# modules can depend on it.

notice_target := NOTICE-$(if \

    $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-$(LOCAL_MODULE_CLASS)-$(LOCAL_MODULE)

    $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-$(LOCAL_MODULE_CLASS)-$(LOCAL_MODULE)

.PHONY: $(notice_target)

$(notice_target): $(installed_notice_file)

core/soong_cc_prebuilt.mk

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ my_static_libraries := \ 
      $(LOCAL_STATIC_LIBRARIES))

installed_static_library_notice_file_targets := \

    $(foreach lib,$(my_static_libraries) $(LOCAL_WHOLE_STATIC_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-STATIC_LIBRARIES-$(lib))



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)