ee75813162
Jars in APEXes have Make module names <jar_name>.<apex_name>. e.g. updatable-apex.com.android.media. Previously, we have used <jar_name> which actually meant the platform variant of the jar. This is not only incorrect, but also is causing problem as the platform variant is no longer available when the jar is configured to be available only for the corresponding APEX (via the apex_available property). Fixing the problem by correctly using <jar_name>.<apex_name> scheme. Bug: N/A Test: m Change-Id: I6e255ce88c9bd80120b29197fb2637a64010f531 Merged-In: I6e255ce88c9bd80120b29197fb2637a64010f531
63 lines
2.4 KiB
Makefile
63 lines
2.4 KiB
Makefile
# Copyright (C) 2014 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.
|
|
|
|
#
|
|
# Rules to check if classes in the boot jars are from the whitelisted packages.
|
|
#
|
|
|
|
ifneq ($(SKIP_BOOT_JARS_CHECK),true)
|
|
ifneq ($(TARGET_BUILD_PDK),true)
|
|
ifdef PRODUCT_BOOT_JARS
|
|
|
|
intermediates := $(call intermediates-dir-for, PACKAGING, boot-jars-package-check,,COMMON)
|
|
stamp := $(intermediates)/stamp
|
|
|
|
# The actual names for the updatable jars are <jar_name>.<apex_name> e.g., updatable-media.com.android.media
|
|
updatable_boot_jars := $(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),\
|
|
$(eval apex := $(call word-colon,1,$(pair)))\
|
|
$(eval jar := $(call word-colon,2,$(pair)))\
|
|
$(jar).$(apex)\
|
|
)
|
|
#TODO(jiyong) merge art_boot_jars into updatable_boot_jars
|
|
art_boot_jars := $(addsuffix .com.android.art.release,$(filter $(ART_APEX_JARS),$(PRODUCT_BOOT_JARS)))
|
|
|
|
platform_boot_jars := $(filter-out \
|
|
$(ART_APEX_JARS)\
|
|
$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),$(call word-colon,2,$(pair))),\
|
|
$(PRODUCT_BOOT_JARS)\
|
|
)
|
|
|
|
built_boot_jars := $(foreach j, $(updatable_boot_jars) $(art_boot_jars) $(platform_boot_jars), \
|
|
$(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar)
|
|
script := build/make/core/tasks/check_boot_jars/check_boot_jars.py
|
|
whitelist_file := build/make/core/tasks/check_boot_jars/package_whitelist.txt
|
|
|
|
$(stamp): PRIVATE_BOOT_JARS := $(built_boot_jars)
|
|
$(stamp): PRIVATE_SCRIPT := $(script)
|
|
$(stamp): PRIVATE_WHITELIST := $(whitelist_file)
|
|
$(stamp) : $(built_boot_jars) $(script) $(whitelist_file)
|
|
@echo "Check package name for $(PRIVATE_BOOT_JARS)"
|
|
$(hide) $(PRIVATE_SCRIPT) $(PRIVATE_WHITELIST) $(PRIVATE_BOOT_JARS)
|
|
$(hide) mkdir -p $(dir $@) && touch $@
|
|
|
|
.PHONY: check-boot-jars
|
|
check-boot-jars : $(stamp)
|
|
|
|
# Run check-boot-jars by default
|
|
droidcore : check-boot-jars
|
|
|
|
endif # PRODUCT_BOOT_JARS
|
|
endif # TARGET_BUILD_PDK not true
|
|
endif # SKIP_BOOT_JARS_CHECK not true
|