From 3594cee467df0ce33e4bf17584afddafbb715036 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 22 Sep 2016 10:56:36 -0700 Subject: [PATCH] link_type check: Support modules installed into /data Test: compare build.ninja before/after, look at warnings.html Change-Id: I1b78748dd80b73d2601b2adf0aaac8a6b2b350d5 --- core/definitions.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 29b6539d6..d2cafef6c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -3128,18 +3128,27 @@ endef define link-type-partitions ifndef LOCAL_IS_HOST_MODULE -ifeq (true,$(LOCAL_PROPRIETARY_MODULE)) +ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) +ifneq ($(filter $(TARGET_OUT_VENDOR)/%,$(my_module_path)),) $(1): PRIVATE_LINK_TYPE += partition:vendor +$(1): PRIVATE_WARN_TYPES += partition:data $(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm -else ifeq (true,$(LOCAL_OEM_MODULE)) +else ifneq ($(filter $(TARGET_OUT_OEM)/%,$(my_module_path)),) $(1): PRIVATE_LINK_TYPE += partition:oem +$(1): PRIVATE_WARN_TYPES += partition:data $(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm -else ifeq (true,$(LOCAL_ODM_MODULE)) +else ifneq ($(filter $(TARGET_OUT_ODM)/%,$(my_module_path)),) $(1): PRIVATE_LINK_TYPE += partition:odm +$(1): PRIVATE_WARN_TYPES += partition:data $(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm +else ifneq ($(filter $(TARGET_OUT_DATA)/%,$(my_module_path)),) +$(1): PRIVATE_LINK_TYPE += partition:data +$(1): PRIVATE_ALLOWED_TYPES += partition:data partition:vendor partition:oem partition:odm else -# TODO: Mark libraries in /data -$(1): PRIVATE_WARN_TYPES += partition:vendor partition:oem partition:odm +$(1): PRIVATE_WARN_TYPES += partition:vendor partition:oem partition:odm partition:data +endif +else # uninstallable module +$(1): PRIVATE_ALLOWED_TYPES += partition:vendor partition:oem partition:odm partition:data endif endif endef -- 2.11.0