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

Commit 83aba3a7 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix link_type checking" am: 665cda08 am: 1347d959 

am: 8459bbca

Change-Id: I22da0f1703995c4734a72901abe2dbcee62c1406
parents f71719b6 8459bbca

core/binary.mk

+10 −13
Original line number Diff line number Diff line
@@ -1365,13 +1365,17 @@ endif 
####################################################



my_link_type := $(intermediates)/link_type

all_link_types: $(my_link_type)

ifdef LOCAL_SDK_VERSION

$(my_link_type): PRIVATE_LINK_TYPE := ndk

$(my_link_type): PRIVATE_ALLOWED_TYPES := ndk

$(my_link_type): PRIVATE_LINK_TYPE := native:ndk

$(my_link_type): PRIVATE_WARN_TYPES :=

$(my_link_type): PRIVATE_ALLOWED_TYPES := native:ndk

else

$(my_link_type): PRIVATE_LINK_TYPE := platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := (ndk|platform)

$(my_link_type): PRIVATE_LINK_TYPE := native:platform

$(my_link_type): PRIVATE_WARN_TYPES :=

$(my_link_type): PRIVATE_ALLOWED_TYPES := native:ndk native:platform

endif

$(eval $(call link-type-partitions,$(my_link_type)))

my_link_type_deps := $(strip \

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

     $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/link_type))
@@ -1383,16 +1387,9 @@ endif 
$(my_link_type): PRIVATE_DEPS := $(my_link_type_deps)

$(my_link_type): PRIVATE_MODULE := $(LOCAL_MODULE)

$(my_link_type): PRIVATE_MAKEFILE := $(LOCAL_MODULE_MAKEFILE)

$(my_link_type): $(my_link_type_deps)

$(my_link_type): $(my_link_type_deps) $(CHECK_LINK_TYPE)

	@echo Check module type: $@

	$(hide) mkdir -p $(dir $@) && rm -f $@

ifdef my_link_type_deps

	$(hide) for f in $(PRIVATE_DEPS); do \

	  grep -qE '^$(PRIVATE_ALLOWED_TYPES)$$' $$f || \

	    ($(call echo-error,"$(PRIVATE_MAKEFILE): $(PRIVATE_MODULE) ($(PRIVATE_LINK_TYPE)) should not link to $$(basename $${f%_intermediates/link_type}) ($$(cat $$f))"); exit 1) \

	done

endif

	$(hide) echo $(PRIVATE_LINK_TYPE) >$@

	$(check-link-type)





###########################################################

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX) 
JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar

FAT16COPY := build/tools/fat16copy.py

CHECK_LINK_TYPE := build/tools/check_link_type.py



ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

JACK_DEFAULT_ARGS :=

core/definitions.mk

+29 −0
Original line number Diff line number Diff line
@@ -3115,6 +3115,35 @@ $(strip $(if $(LOCAL_RECORDED_MODULE_TYPE),, 
      $(error Invalid module type: $(1))))))

endef



###########################################################

# Link type checking

###########################################################

define check-link-type

$(hide) mkdir -p $(dir $@) && rm -f $@

$(hide) $(CHECK_LINK_TYPE) --makefile $(PRIVATE_MAKEFILE) --module $(PRIVATE_MODULE) \

  --type "$(PRIVATE_LINK_TYPE)" $(addprefix --allowed ,$(PRIVATE_ALLOWED_TYPES)) \

  $(addprefix --warn ,$(PRIVATE_WARN_TYPES)) $(PRIVATE_DEPS)

$(hide) echo "$(PRIVATE_LINK_TYPE)" >$@

endef



define link-type-partitions

ifndef LOCAL_IS_HOST_MODULE

ifeq (true,$(LOCAL_PROPRIETARY_MODULE))

$(1): PRIVATE_LINK_TYPE += partition:vendor

$(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm

else ifeq (true,$(LOCAL_OEM_MODULE))

$(1): PRIVATE_LINK_TYPE += partition:oem

$(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm

else ifeq (true,$(LOCAL_ODM_MODULE))

$(1): PRIVATE_LINK_TYPE += partition:odm

$(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm

else

# TODO: Mark libraries in /data

$(1): PRIVATE_WARN_TYPES += partition:vendor partition:oem partition:odm

endif

endif

endef



###########################################################

## Other includes

###########################################################

core/install_jni_libs_internal.mk

+10 −12
Original line number Diff line number Diff line
@@ -102,28 +102,26 @@ endif # outer my_prebuilt_jni_libs 
# Verify that all included libraries are built against the NDK

ifneq ($(strip $(LOCAL_JNI_SHARED_LIBRARIES)),)

my_link_type := $(call intermediates-dir-for,APPS,$(LOCAL_MODULE))/$(my_2nd_arch_prefix)jni_link_type

all_link_types: $(my_link_type)

my_link_type_deps := $(strip \

  $(foreach l,$(LOCAL_JNI_SHARED_LIBRARIES),\

    $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),,,$(my_2nd_arch_prefix))/link_type))

ifneq ($(LOCAL_SDK_VERSION),)

$(my_link_type): PRIVATE_LINK_TYPE := sdk

$(my_link_type): PRIVATE_ALLOWED_TYPES := ndk

$(my_link_type): PRIVATE_LINK_TYPE := app:sdk

$(my_link_type): PRIVATE_WARN_TYPES := native:platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := native:ndk

else

$(my_link_type): PRIVATE_LINK_TYPE := platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := (ndk|platform)

$(my_link_type): PRIVATE_LINK_TYPE := app:platform

$(my_link_type): PRIVATE_WARN_TYPES :=

$(my_link_type): PRIVATE_ALLOWED_TYPES := native:ndk native:platform

endif

$(eval $(call link-type-partitions,$(my_link_type)))

$(my_link_type): PRIVATE_DEPS := $(my_link_type_deps)

$(my_link_type): PRIVATE_MODULE := $(LOCAL_MODULE)

$(my_link_type): PRIVATE_MAKEFILE := $(LOCAL_MODULE_MAKEFILE)

$(my_link_type): $(my_link_type_deps)

$(my_link_type): $(my_link_type_deps) $(CHECK_LINK_TYPE)

	@echo Check JNI module types: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) rm -f $@

	$(hide) for f in $(PRIVATE_DEPS); do \

	  grep -qE '^$(PRIVATE_ALLOWED_TYPES)$$' $$f || \

	    $(call echo-warning,"$(PRIVATE_MAKEFILE): $(PRIVATE_MODULE) ($(PRIVATE_LINK_TYPE)) should not link to $$(basename $${f%_intermediates/link_type}) ($$(cat $$f))"); \

	done

	$(hide) touch $@

	$(check-link-type)



$(LOCAL_BUILT_MODULE): | $(my_link_type)

core/java_common.mk

+13 −14
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ endif # need_compile_java 
###########################################################

ifndef LOCAL_IS_HOST_MODULE

my_link_type := $(intermediates.COMMON)/link_type

all_link_types: $(my_link_type)

my_link_type_deps := $(strip \

  $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES),\

    $(call intermediates-dir-for, \
@@ -387,27 +388,25 @@ my_link_type_deps := $(strip \ 
    $(call intermediates-dir-for, \

      APPS,$(lib),,COMMON)/link_type))

ifeq ($(LOCAL_SDK_VERSION),system_current)

$(my_link_type): PRIVATE_LINK_TYPE := system

$(my_link_type): PRIVATE_ALLOWED_TYPES := (sdk|system)

$(my_link_type): PRIVATE_LINK_TYPE := java:system

$(my_link_type): PRIVATE_WARN_TYPES := java:platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := java:sdk java:system

else ifneq ($(LOCAL_SDK_VERSION),)

$(my_link_type): PRIVATE_LINK_TYPE := sdk

$(my_link_type): PRIVATE_ALLOWED_TYPES := sdk

$(my_link_type): PRIVATE_LINK_TYPE := java:sdk

$(my_link_type): PRIVATE_WARN_TYPES := java:system java:platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := java:sdk

else

$(my_link_type): PRIVATE_LINK_TYPE := platform

$(my_link_type): PRIVATE_ALLOWED_TYPES := (sdk|system|platform)

$(my_link_type): PRIVATE_LINK_TYPE := java:platform

$(my_link_type): PRIVATE_WARN_TYPES :=

$(my_link_type): PRIVATE_ALLOWED_TYPES := java:sdk java:system java:platform

endif

$(eval $(call link-type-partitions,$(my_link_type)))

$(my_link_type): PRIVATE_DEPS := $(my_link_type_deps)

$(my_link_type): PRIVATE_MODULE := $(LOCAL_MODULE)

$(my_link_type): PRIVATE_MAKEFILE := $(LOCAL_MODULE_MAKEFILE)

$(my_link_type): $(my_link_type_deps)

$(my_link_type): $(my_link_type_deps) $(CHECK_LINK_TYPE)

	@echo Check Java library module types: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) rm -f $@

	$(hide) for f in $(PRIVATE_DEPS); do \

	  grep -qE '^$(PRIVATE_ALLOWED_TYPES)$$' $$f || \

	    $(call echo-warning,"$(PRIVATE_MAKEFILE): $(PRIVATE_MODULE) ($(PRIVATE_LINK_TYPE)) should not link to $$(basename $${f%_intermediates/link_type}) ($$(cat $$f))"); \

	done

	$(hide) echo $(PRIVATE_LINK_TYPE) >$@

	$(check-link-type)



$(LOCAL_BUILT_MODULE): $(my_link_type)

endif  # !LOCAL_IS_HOST_MODULE