From 7d40b59c4dd4985dceca65855c7b97819e6d7918 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 4 May 2020 11:12:00 +0000 Subject: [PATCH] Reland "mark platform un-availability"" This reverts commit 6e1fa4452b933b103145f5b3128356ff96dd7c1a. Reason for revert: relanding a reverted changed Bug: 153073816 Test: m Exempt-From-Owner-Approval: cherry-pick from AOSP Merged-In: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c (cherry picked from commit 403c255b6ffad0f2fe9710e7e60823d844657837) Change-Id: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c --- core/base_rules.mk | 10 +++++++ core/clear_vars.mk | 1 + core/tasks/platform_availability_check.mk | 36 +++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 core/tasks/platform_availability_check.mk diff --git a/core/base_rules.mk b/core/base_rules.mk index 1db73ae6d..15d7a0ef2 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -811,6 +811,16 @@ ifdef LOCAL_PICKUP_FILES ALL_MODULES.$(my_register_name).PICKUP_FILES := \ $(ALL_MODULES.$(my_register_name).PICKUP_FILES) $(LOCAL_PICKUP_FILES) endif +# Record the platform availability of this module. Note that the availability is not +# meaningful for non-installable modules (e.g., static libs) or host modules. +# We only care about modules that are installable to the device. +ifeq (true,$(LOCAL_NOT_AVAILABLE_FOR_PLATFORM)) + ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) + ifndef LOCAL_IS_HOST_MODULE + ALL_MODULES.$(my_register_name).NOT_AVAILABLE_FOR_PLATFORM := true + endif + endif +endif my_required_modules := $(LOCAL_REQUIRED_MODULES) \ $(LOCAL_REQUIRED_MODULES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 3d481df55..0c613fa6e 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -192,6 +192,7 @@ LOCAL_NO_PIC:= LOCAL_NOSANITIZE:= LOCAL_NO_STANDARD_LIBRARIES:= LOCAL_NO_STATIC_ANALYZER:= +LOCAL_NOT_AVAILABLE_FOR_PLATFORM:= LOCAL_NOTICE_FILE:= LOCAL_ODM_MODULE:= LOCAL_OEM_MODULE:= diff --git a/core/tasks/platform_availability_check.mk b/core/tasks/platform_availability_check.mk new file mode 100644 index 000000000..043d13044 --- /dev/null +++ b/core/tasks/platform_availability_check.mk @@ -0,0 +1,36 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Check whether there is any module that isn't available for platform +# is installed to the platform. + +# Filter FAKE and NON_INSTALLABLE modules out and then collect those are not +# available for platform +_modules_not_available_for_platform := \ +$(strip $(foreach m,$(product_MODULES),\ + $(if $(filter-out FAKE,$(ALL_MODULES.$(m).CLASS)),\ + $(if $(ALL_MODULES.$(m).INSTALLED),\ + $(if $(filter true,$(ALL_MODULES.$(m).NOT_AVAILABLE_FOR_PLATFORM)),\ + $(m)))))) + +_violators_with_path := $(foreach m,$(sort $(_modules_not_available_for_platform)),\ + $(m):$(word 1,$(ALL_MODULES.$(m).PATH))\ +) + +$(call maybe-print-list-and-error,$(_violators_with_path),\ +Following modules are requested to be installed. But are not available \ +for platform because they do not have "//apex_available:platform" or \ +they depend on other modules that are not available for platform)