Merge "Remove obsolete PDK build functionality" into rvc-dev-plus-aosp am: 3d3cd8a6df am: c17252f300
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12347726 Change-Id: I6ec7720b0224b55a8b32f2d73e1ed66b75b3ab81
This commit is contained in:
Dan Willemsen
Automerger Merge Worker
commit
c9fbe64e90
14 changed files with 30 additions and 574 deletions
186
core/Makefile
186
core/Makefile
|
|
@ -553,12 +553,8 @@ event_log_tags_file := $(TARGET_OUT)/etc/event-log-tags
|
|||
all_event_log_tags_src := \
|
||||
$(sort $(foreach m, $(ALL_MODULES), $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))
|
||||
|
||||
# PDK builds will already have a full list of tags that needs to get merged
|
||||
# in with the ones from source
|
||||
pdk_fusion_log_tags_file := $(patsubst $(PRODUCT_OUT)/%,$(_pdk_fusion_intermediates)/%,$(filter $(event_log_tags_file),$(ALL_PDK_FUSION_FILES)))
|
||||
|
||||
$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src) $(pdk_fusion_log_tags_file)
|
||||
$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py
|
||||
$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src)
|
||||
$(all_event_log_tags_file): $(all_event_log_tags_src) $(MERGETAGS) build/make/tools/event_log_tags.py
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(hide) $(MERGETAGS) -o $@ $(PRIVATE_SRC_FILES)
|
||||
|
||||
|
|
@ -572,9 +568,9 @@ event_log_tags_src := \
|
|||
$(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \
|
||||
$(filter-out vendor/% device/% out/%,$(all_event_log_tags_src)))
|
||||
|
||||
$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src) $(pdk_fusion_log_tags_file)
|
||||
$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src)
|
||||
$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)
|
||||
$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py
|
||||
$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(hide) $(MERGETAGS) -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)
|
||||
|
||||
|
|
@ -955,7 +951,6 @@ tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt
|
|||
tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html
|
||||
kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt
|
||||
winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt
|
||||
pdk_fusion_notice_files := $(filter $(TARGET_OUT_NOTICE_FILES)/%, $(ALL_PDK_FUSION_FILES))
|
||||
|
||||
# Some targets get included under $(PRODUCT_OUT) for debug symbols or other
|
||||
# reasons--not to be flashed onto any device. Targets under these directories
|
||||
|
|
@ -972,7 +967,7 @@ $(eval $(call combine-notice-files, html, \
|
|||
$(target_notice_file_html), \
|
||||
"Notices for files contained in the filesystem images in this directory:", \
|
||||
$(TARGET_OUT_NOTICE_FILES), \
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file) $(pdk_fusion_notice_files), \
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file), \
|
||||
$(exclude_target_dirs)))
|
||||
$(target_notice_file_html_gz): $(target_notice_file_html) | $(MINIGZIP)
|
||||
$(hide) $(MINIGZIP) -9 < $< > $@
|
||||
|
|
@ -1016,7 +1011,7 @@ installed_odm_dlkm_notice_xml_gz := $(TARGET_OUT_ODM_DLKM)/etc/NOTICE.xml.gz
|
|||
# Notice files are copied to TARGET_OUT_NOTICE_FILES as a side-effect of their module
|
||||
# being built. A notice xml file must depend on all modules that could potentially
|
||||
# install a license file relevant to it.
|
||||
license_modules := $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file) $(pdk_fusion_notice_files)
|
||||
license_modules := $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file)
|
||||
# Only files copied to a system image need system image notices.
|
||||
license_modules := $(filter $(PRODUCT_OUT)/%,$(license_modules))
|
||||
# Phonys/fakes don't have notice files (though their deps might)
|
||||
|
|
@ -2277,17 +2272,10 @@ endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
|
|||
|
||||
# -----------------------------------------------------------------
|
||||
# system image
|
||||
#
|
||||
# Remove overridden packages from $(ALL_PDK_FUSION_FILES)
|
||||
PDK_FUSION_SYSIMG_FILES := \
|
||||
$(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \
|
||||
$(ALL_PDK_FUSION_FILES))
|
||||
|
||||
INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \
|
||||
$(ALL_GENERATED_SOURCES) \
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES) \
|
||||
$(PDK_FUSION_SYSIMG_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP))
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)))
|
||||
|
||||
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
|
||||
|
||||
|
|
@ -2455,111 +2443,14 @@ endif # BUILDING_SYSTEM_IMAGE
|
|||
sync syncsys: $(INTERNAL_SYSTEMIMAGE_FILES)
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
## platform.zip: system, plus other files to be used in PDK fusion build,
|
||||
## in a zip file
|
||||
##
|
||||
## PDK_PLATFORM_ZIP_PRODUCT_BINARIES is used to store specified files to platform.zip.
|
||||
## The variable will be typically set from BoardConfig.mk.
|
||||
## Files under out dir will be rejected to prevent possible conflicts with other rules.
|
||||
ifneq (,$(BUILD_PLATFORM_ZIP))
|
||||
pdk_odex_javalibs := $(strip $(foreach m,$(DEXPREOPT.MODULES.JAVA_LIBRARIES),\
|
||||
$(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))
|
||||
pdk_odex_apps := $(strip $(foreach m,$(DEXPREOPT.MODULES.APPS),\
|
||||
$(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))
|
||||
pdk_classes_dex := $(strip \
|
||||
$(foreach m,$(pdk_odex_javalibs),$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar) \
|
||||
$(foreach m,$(pdk_odex_apps),$(call intermediates-dir-for,APPS,$(m))/package.apk))
|
||||
|
||||
pdk_odex_config_mk := $(PRODUCT_OUT)/pdk_dexpreopt_config.mk
|
||||
$(pdk_odex_config_mk): PRIVATE_JAVA_LIBRARIES := $(pdk_odex_javalibs)
|
||||
$(pdk_odex_config_mk): PRIVATE_APPS := $(pdk_odex_apps)
|
||||
$(pdk_odex_config_mk) :
|
||||
@echo "PDK odex config makefile: $@"
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(hide) echo "# Auto-generated. Do not modify." > $@
|
||||
$(hide) echo "PDK.DEXPREOPT.JAVA_LIBRARIES:=$(PRIVATE_JAVA_LIBRARIES)" >> $@
|
||||
$(hide) echo "PDK.DEXPREOPT.APPS:=$(PRIVATE_APPS)" >> $@
|
||||
$(foreach m,$(PRIVATE_JAVA_LIBRARIES),\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT:=$(DEXPREOPT.$(m).DEX_PREOPT)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\
|
||||
)
|
||||
$(foreach m,$(PRIVATE_APPS),\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,APPS,$(m))/package.apk)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT:=$(DEXPREOPT.$(m).DEX_PREOPT)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).PRIVILEGED_MODULE:=$(DEXPREOPT.$(m).PRIVILEGED_MODULE)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).VENDOR_MODULE:=$(DEXPREOPT.$(m).VENDOR_MODULE)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).TARGET_ARCH:=$(DEXPREOPT.$(m).TARGET_ARCH)" >> $@$(newline)\
|
||||
$(hide) echo "PDK.DEXPREOPT.$(m).STRIPPED_SRC:=$(patsubst $(PRODUCT_OUT)/%,%,$(DEXPREOPT.$(m).INSTALLED_STRIPPED))" >> $@$(newline)\
|
||||
)
|
||||
|
||||
PDK_PLATFORM_ZIP_PRODUCT_BINARIES := $(filter-out $(OUT_DIR)/%,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES))
|
||||
INSTALLED_PLATFORM_ZIP := $(PRODUCT_OUT)/platform.zip
|
||||
|
||||
$(INSTALLED_PLATFORM_ZIP): PRIVATE_DEX_FILES := $(pdk_classes_dex)
|
||||
$(INSTALLED_PLATFORM_ZIP): PRIVATE_ODEX_CONFIG := $(pdk_odex_config_mk)
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(SOONG_ZIP)
|
||||
# dependencies for the other partitions are defined below after their file lists
|
||||
# are known
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) $(pdk_classes_dex) $(pdk_odex_config_mk) $(API_FINGERPRINT)
|
||||
$(call pretty,"Platform zip package: $(INSTALLED_PLATFORM_ZIP)")
|
||||
rm -f $@ $@.lst
|
||||
echo "-C $(PRODUCT_OUT)" >> $@.lst
|
||||
echo "-D $(TARGET_OUT)" >> $@.lst
|
||||
echo "-D $(TARGET_OUT_NOTICE_FILES)" >> $@.lst
|
||||
echo "$(addprefix -f $(TARGET_OUT_UNSTRIPPED)/,$(PDK_SYMBOL_FILES_LIST))" >> $@.lst
|
||||
ifdef BUILDING_VENDOR_IMAGE
|
||||
echo "-D $(TARGET_OUT_VENDOR)" >> $@.lst
|
||||
endif
|
||||
ifdef BUILDING_PRODUCT_IMAGE
|
||||
echo "-D $(TARGET_OUT_PRODUCT)" >> $@.lst
|
||||
endif
|
||||
ifdef BUILDING_SYSTEM_EXT_IMAGE
|
||||
echo "-D $(TARGET_OUT_SYSTEM_EXT)" >> $@.lst
|
||||
endif
|
||||
ifdef BUILDING_ODM_IMAGE
|
||||
echo "-D $(TARGET_OUT_ODM)" >> $@.lst
|
||||
endif
|
||||
ifdef BUILDING_VENDOR_DLKM_IMAGE
|
||||
echo "-D $(TARGET_OUT_VENDOR_DLKM)" >> $@.lst
|
||||
endif
|
||||
ifdef BUILDING_ODM_DLKM_IMAGE
|
||||
echo "-D $(TARGET_OUT_ODM_DLKM)" >> $@.lst
|
||||
endif
|
||||
ifneq ($(PDK_PLATFORM_JAVA_ZIP_CONTENTS),)
|
||||
echo "-C $(OUT_DIR)" >> $@.lst
|
||||
for f in $(filter-out $(PRIVATE_DEX_FILES),$(addprefix -f $(OUT_DIR)/,$(PDK_PLATFORM_JAVA_ZIP_CONTENTS))); do \
|
||||
if [ -e $$f ]; then \
|
||||
echo "-f $$f"; \
|
||||
fi \
|
||||
done >> $@.lst
|
||||
endif
|
||||
ifneq ($(PDK_PLATFORM_ZIP_PRODUCT_BINARIES),)
|
||||
echo "-C . $(addprefix -f ,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES))" >> $@.lst
|
||||
endif
|
||||
@# Add dex-preopt files and config.
|
||||
$(if $(PRIVATE_DEX_FILES),\
|
||||
echo "-C $(OUT_DIR) $(addprefix -f ,$(PRIVATE_DEX_FILES))") >> $@.lst
|
||||
echo "-C $(dir $(API_FINGERPRINT)) -f $(API_FINGERPRINT)" >> $@.lst
|
||||
touch $(PRODUCT_OUT)/pdk.mk
|
||||
echo "-C $(PRODUCT_OUT) -f $(PRIVATE_ODEX_CONFIG) -f $(PRODUCT_OUT)/pdk.mk" >> $@.lst
|
||||
$(SOONG_ZIP) --ignore_missing_files -o $@ @$@.lst
|
||||
|
||||
# Old PDK fusion targets
|
||||
.PHONY: platform
|
||||
platform: $(INSTALLED_PLATFORM_ZIP)
|
||||
platform:
|
||||
echo "Warning: 'platform' is obsolete"
|
||||
|
||||
.PHONY: platform-java
|
||||
platform-java: platform
|
||||
|
||||
# Dist the platform.zip
|
||||
ifneq (,$(filter platform platform-java, $(MAKECMDGOALS)))
|
||||
$(call dist-for-goals, platform platform-java, $(INSTALLED_PLATFORM_ZIP))
|
||||
endif
|
||||
|
||||
endif # BUILD_PLATFORM_ZIP
|
||||
platform-java:
|
||||
echo "Warning: 'platform-java' is obsolete"
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# data partition image
|
||||
|
|
@ -2693,9 +2584,7 @@ endif
|
|||
|
||||
INTERNAL_SYSTEMOTHERIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_SYSTEM_OTHER)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
# system_other dex files are installed as a side-effect of installing system image files
|
||||
INTERNAL_SYSTEMOTHERIMAGE_FILES += $(INTERNAL_SYSTEMIMAGE_FILES)
|
||||
|
|
@ -2758,12 +2647,7 @@ endif # BUILDING_SYSTEM_OTHER_IMAGE
|
|||
ifdef BUILDING_VENDOR_IMAGE
|
||||
INTERNAL_VENDORIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_VENDOR)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
|
||||
# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_VENDOR := $(PRODUCT_OUT)/installed-files-vendor.txt
|
||||
INSTALLED_FILES_JSON_VENDOR := $(INSTALLED_FILES_FILE_VENDOR:.txt=.json)
|
||||
|
|
@ -2891,12 +2775,7 @@ endif
|
|||
ifdef BUILDING_PRODUCT_IMAGE
|
||||
INTERNAL_PRODUCTIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_PRODUCT)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
|
||||
# platform.zip depends on $(INTERNAL_PRODUCTIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_PRODUCTIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_PRODUCT := $(PRODUCT_OUT)/installed-files-product.txt
|
||||
INSTALLED_FILES_JSON_PRODUCT := $(INSTALLED_FILES_FILE_PRODUCT:.txt=.json)
|
||||
|
|
@ -2947,12 +2826,7 @@ endif
|
|||
ifdef BUILDING_SYSTEM_EXT_IMAGE
|
||||
INTERNAL_SYSTEM_EXTIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_SYSTEM_EXT)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
|
||||
# platform.zip depends on $(INTERNAL_SYSTEM_EXTIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEM_EXTIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_SYSTEM_EXT := $(PRODUCT_OUT)/installed-files-system_ext.txt
|
||||
INSTALLED_FILES_JSON_SYSTEM_EXT := $(INSTALLED_FILES_FILE_SYSTEM_EXT:.txt=.json)
|
||||
|
|
@ -3005,11 +2879,7 @@ endif
|
|||
ifdef BUILDING_ODM_IMAGE
|
||||
INTERNAL_ODMIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_ODM)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
# platform.zip depends on $(INTERNAL_ODMIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_ODMIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_ODM := $(PRODUCT_OUT)/installed-files-odm.txt
|
||||
INSTALLED_FILES_JSON_ODM := $(INSTALLED_FILES_FILE_ODM:.txt=.json)
|
||||
|
|
@ -3060,11 +2930,7 @@ endif
|
|||
ifdef BUILDING_VENDOR_DLKM_IMAGE
|
||||
INTERNAL_VENDOR_DLKMIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_VENDOR_DLKM)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
# platform.zip depends on $(INTERNAL_VENDOR_DLKMIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDOR_DLKMIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_VENDOR_DLKM := $(PRODUCT_OUT)/installed-files-vendor_dlkm.txt
|
||||
INSTALLED_FILES_JSON_VENDOR_DLKM := $(INSTALLED_FILES_FILE_VENDOR_DLKM:.txt=.json)
|
||||
|
|
@ -3115,11 +2981,7 @@ endif
|
|||
ifdef BUILDING_ODM_DLKM_IMAGE
|
||||
INTERNAL_ODM_DLKMIMAGE_FILES := \
|
||||
$(filter $(TARGET_OUT_ODM_DLKM)/%,\
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES)\
|
||||
$(ALL_PDK_FUSION_FILES)) \
|
||||
$(PDK_FUSION_SYMLINK_STAMP)
|
||||
# platform.zip depends on $(INTERNAL_ODM_DLKMIMAGE_FILES).
|
||||
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_ODM_DLKMIMAGE_FILES)
|
||||
$(ALL_DEFAULT_INSTALLED_MODULES))
|
||||
|
||||
INSTALLED_FILES_FILE_ODM_DLKM := $(PRODUCT_OUT)/installed-files-odm_dlkm.txt
|
||||
INSTALLED_FILES_JSON_ODM_DLKM := $(INSTALLED_FILES_FILE_ODM_DLKM:.txt=.json)
|
||||
|
|
@ -3939,9 +3801,6 @@ else
|
|||
ifeq ($(TARGET_PRODUCT),sdk)
|
||||
build_ota_package := false
|
||||
endif
|
||||
ifeq ($(TARGET_BUILD_PDK),true)
|
||||
build_ota_package := false
|
||||
endif
|
||||
ifneq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
|
||||
ifneq ($(filter generic%,$(TARGET_DEVICE)),)
|
||||
build_ota_package := false
|
||||
|
|
@ -5313,13 +5172,6 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES)
|
|||
$(hide) zip -qjX $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
|
||||
|
||||
endif
|
||||
# -----------------------------------------------------------------
|
||||
# Old PDK stuffs, retired
|
||||
# The pdk package (Platform Development Kit)
|
||||
|
||||
#ifneq (,$(filter pdk,$(MAKECMDGOALS)))
|
||||
# include development/pdk/Pdk.mk
|
||||
#endif
|
||||
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ built_module := $(LOCAL_BUILT_MODULE)
|
|||
# We skip it for unbundled app builds where we cannot build veridex.
|
||||
module_run_appcompat :=
|
||||
ifeq (true,$(non_system_module))
|
||||
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
|
||||
ifeq (,$(TARGET_BUILD_APPS)) # ! unbundled app build
|
||||
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
|
||||
module_run_appcompat := true
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -428,95 +428,12 @@ endif
|
|||
endif
|
||||
endif
|
||||
|
||||
# Set up PDK so we can use TARGET_BUILD_PDK to select prebuilt tools below
|
||||
.PHONY: pdk fusion
|
||||
pdk fusion: $(DEFAULT_GOAL)
|
||||
|
||||
# What to build:
|
||||
# pdk fusion if:
|
||||
# 1) PDK_FUSION_PLATFORM_ZIP / PDK_FUSION_PLATFORM_DIR is passed in from the environment
|
||||
# or
|
||||
# 2) the platform.zip / pdk.mk exists in the default location
|
||||
# or
|
||||
# 3) fusion is a command line build goal,
|
||||
# PDK_FUSION_PLATFORM_ZIP is needed anyway, then do we need the 'fusion' goal?
|
||||
# otherwise pdk only if:
|
||||
# 1) pdk is a command line build goal
|
||||
# or
|
||||
# 2) TARGET_BUILD_PDK is passed in from the environment
|
||||
|
||||
# if PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR is specified, do not override.
|
||||
ifeq (,$(strip $(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR)))
|
||||
# Most PDK project paths should be using vendor/pdk/TARGET_DEVICE
|
||||
# but some legacy ones (e.g. mini_armv7a_neon generic PDK) were setup
|
||||
# with vendor/pdk/TARGET_PRODUCT.
|
||||
# Others are set up with vendor/pdk/TARGET_DEVICE/TARGET_DEVICE-userdebug
|
||||
_pdk_fusion_search_paths := \
|
||||
vendor/pdk/$(TARGET_DEVICE)/$(TARGET_DEVICE)-$(TARGET_BUILD_VARIANT)/platform \
|
||||
vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform \
|
||||
vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform \
|
||||
vendor/pdk/$(TARGET_PRODUCT)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform \
|
||||
vendor/pdk/$(TARGET_PRODUCT)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform
|
||||
|
||||
_pdk_fusion_default_platform_zip := $(strip $(foreach p,$(_pdk_fusion_search_paths),$(wildcard $(p)/platform.zip)))
|
||||
ifneq (,$(_pdk_fusion_default_platform_zip))
|
||||
PDK_FUSION_PLATFORM_ZIP := $(word 1, $(_pdk_fusion_default_platform_zip))
|
||||
_pdk_fusion_default_platform_zip :=
|
||||
else
|
||||
_pdk_fusion_default_platform_mk := $(strip $(foreach p,$(_pdk_fusion_search_paths),$(wildcard $(p)/pdk.mk)))
|
||||
ifneq (,$(_pdk_fusion_default_platform_mk))
|
||||
PDK_FUSION_PLATFORM_DIR := $(dir $(word 1,$(_pdk_fusion_default_platform_mk)))
|
||||
_pdk_fusion_default_platform_mk :=
|
||||
endif
|
||||
endif # _pdk_fusion_default_platform_zip
|
||||
_pdk_fusion_search_paths :=
|
||||
endif # !PDK_FUSION_PLATFORM_ZIP && !PDK_FUSION_PLATFORM_DIR
|
||||
|
||||
ifneq (,$(PDK_FUSION_PLATFORM_ZIP))
|
||||
ifneq (,$(PDK_FUSION_PLATFORM_DIR))
|
||||
$(error Only one of PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR may be specified)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (,$(filter pdk fusion, $(MAKECMDGOALS)))
|
||||
TARGET_BUILD_PDK := true
|
||||
ifneq (,$(filter fusion, $(MAKECMDGOALS)))
|
||||
ifeq (,$(strip $(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR)))
|
||||
$(error Specify PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR to do a PDK fusion.)
|
||||
endif
|
||||
endif # fusion
|
||||
endif # pdk or fusion
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_ZIP
|
||||
TARGET_BUILD_PDK := true
|
||||
ifeq (,$(wildcard $(PDK_FUSION_PLATFORM_ZIP)))
|
||||
ifneq (,$(wildcard $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))/pdk.mk))
|
||||
PDK_FUSION_PLATFORM_DIR := $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))
|
||||
PDK_FUSION_PLATFORM_ZIP :=
|
||||
else
|
||||
$(error Cannot find file $(PDK_FUSION_PLATFORM_ZIP).)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_DIR
|
||||
TARGET_BUILD_PDK := true
|
||||
ifeq (,$(wildcard $(PDK_FUSION_PLATFORM_DIR)/pdk.mk))
|
||||
$(error Cannot find file $(PDK_FUSION_PLATFORM_DIR)/pdk.mk.)
|
||||
endif
|
||||
endif
|
||||
|
||||
BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS))
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Whether we can expect a full build graph
|
||||
ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))
|
||||
ifneq ($(TARGET_BUILD_APPS),)
|
||||
ALLOW_MISSING_DEPENDENCIES := true
|
||||
endif
|
||||
ifeq ($(TARGET_BUILD_PDK),true)
|
||||
ALLOW_MISSING_DEPENDENCIES := true
|
||||
endif
|
||||
ifeq ($(TARGET_BUILD_UNBUNDLED_IMAGE),true)
|
||||
ALLOW_MISSING_DEPENDENCIES := true
|
||||
endif
|
||||
|
|
@ -561,23 +478,23 @@ USE_D8 := true
|
|||
#
|
||||
# Tools that are prebuilts for TARGET_BUILD_USE_PREBUILT_SDKS
|
||||
#
|
||||
ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS)$(filter true,$(TARGET_BUILD_PDK)))
|
||||
ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))
|
||||
AAPT := $(HOST_OUT_EXECUTABLES)/aapt
|
||||
MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
|
||||
|
||||
else # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK
|
||||
else # TARGET_BUILD_USE_PREBUILT_SDKS
|
||||
AAPT := $(prebuilt_sdk_tools_bin)/aapt
|
||||
MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses
|
||||
endif # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK
|
||||
endif # TARGET_BUILD_USE_PREBUILT_SDKS
|
||||
|
||||
ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))
|
||||
# Use RenderScript prebuilts for unbundled builds but not PDK builds
|
||||
# Use RenderScript prebuilts for unbundled builds
|
||||
LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc
|
||||
BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
|
||||
else
|
||||
LLVM_RS_CC := $(prebuilt_sdk_tools_bin)/llvm-rs-cc
|
||||
BCC_COMPAT := $(prebuilt_sdk_tools_bin)/bcc_compat
|
||||
endif # TARGET_BUILD_PDK
|
||||
endif
|
||||
|
||||
prebuilt_sdk_tools :=
|
||||
prebuilt_sdk_tools_bin :=
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ _all_dist_src_dst_pairs :=
|
|||
# certain files with certain goals. When those goals are built
|
||||
# and "dist" is specified, the marked files will be copied to DIST_DIR.
|
||||
#
|
||||
# $(1): a list of goals (e.g. droid, sdk, pdk, ndk). These must be PHONY
|
||||
# $(1): a list of goals (e.g. droid, sdk, ndk). These must be PHONY
|
||||
# $(2): the dist files to add to those goals. If the file contains ':',
|
||||
# the text following the colon is the name that the file is copied
|
||||
# to under the dist directory. Subdirs are ok, and will be created
|
||||
|
|
|
|||
11
core/java.mk
11
core/java.mk
|
|
@ -4,17 +4,6 @@
|
|||
# LOCAL_MODULE_CLASS
|
||||
# all_res_assets
|
||||
|
||||
ifeq ($(TARGET_BUILD_PDK),true)
|
||||
ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),)
|
||||
# LOCAL_SDK not defined or set to current
|
||||
ifeq ($(filter-out current,$(LOCAL_SDK_VERSION)),)
|
||||
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
||||
LOCAL_SDK_VERSION := $(PDK_BUILD_SDK_VERSION)
|
||||
endif #!LOCAL_NO_STANDARD_LIBRARIES
|
||||
endif
|
||||
endif # !PDK_JAVA
|
||||
endif #PDK
|
||||
|
||||
LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
|
||||
LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))
|
||||
|
||||
|
|
|
|||
19
core/main.mk
19
core/main.mk
|
|
@ -177,16 +177,8 @@ $(error stopping)
|
|||
endif
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Variable to check java support level inside PDK build.
|
||||
# Not necessary if the components is not in PDK.
|
||||
# not defined : not supported
|
||||
# "sdk" : sdk API only
|
||||
# "platform" : platform API supproted
|
||||
TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# The pdk (Platform Development Kit) build
|
||||
include build/make/core/pdk_config.mk
|
||||
# PDK builds are no longer supported, this is always platform
|
||||
TARGET_BUILD_JAVA_SUPPORT_LEVEL :=$= platform
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
|
||||
|
|
@ -518,11 +510,6 @@ subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
|
|||
|
||||
$(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk)))
|
||||
|
||||
ifneq (,$(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR))
|
||||
# Bring in the PDK platform.zip modules.
|
||||
include $(BUILD_SYSTEM)/pdk_fusion_modules.mk
|
||||
endif # PDK_FUSION_PLATFORM_ZIP || PDK_FUSION_PLATFORM_DIR
|
||||
|
||||
droid_targets : blueprint_tools
|
||||
|
||||
endif # dont_bother
|
||||
|
|
@ -1724,13 +1711,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED))
|
|||
$(call dist-for-goals, droidcore, $(f)))
|
||||
|
||||
ifneq ($(ANDROID_BUILD_EMBEDDED),true)
|
||||
ifneq ($(TARGET_BUILD_PDK),true)
|
||||
$(call dist-for-goals, droidcore, \
|
||||
$(APPS_ZIP) \
|
||||
$(INTERNAL_EMULATOR_PACKAGE_TARGET) \
|
||||
)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(call dist-for-goals, droidcore, \
|
||||
$(INSTALLED_FILES_FILE_ROOT) \
|
||||
|
|
|
|||
|
|
@ -27,12 +27,8 @@ PARSE_TIME_MAKE_GOALS := \
|
|||
dicttool_aosp \
|
||||
dump-products \
|
||||
eng \
|
||||
fusion \
|
||||
oem_image \
|
||||
online-system-api-sdk-docs \
|
||||
pdk \
|
||||
platform \
|
||||
platform-java \
|
||||
product-graph \
|
||||
samplecode \
|
||||
sdk \
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ endif
|
|||
# We skip it for unbundled app builds where we cannot build veridex.
|
||||
module_run_appcompat :=
|
||||
ifeq (true,$(non_system_module))
|
||||
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
|
||||
ifeq (,$(TARGET_BUILD_APPS)) # ! unbundled app build
|
||||
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
|
||||
module_run_appcompat := true
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,190 +0,0 @@
|
|||
# This file defines the rule to fuse the platform.zip into the current PDK build.
|
||||
PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR :=
|
||||
PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR := \
|
||||
host/common/obj/JAVA_LIBRARIES/bouncycastle-host_intermediates \
|
||||
host/common/obj/JAVA_LIBRARIES/compatibility-host-util_intermediates \
|
||||
host/common/obj/JAVA_LIBRARIES/cts-tradefed-harness_intermediates \
|
||||
host/common/obj/JAVA_LIBRARIES/hosttestlib_intermediates
|
||||
PDK_PLATFORM_JAVA_ZIP_CONTENTS :=
|
||||
|
||||
ifneq (,$(filter platform-java, $(MAKECMDGOALS))$(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR))
|
||||
# additional items to add to platform.zip for platform-java build
|
||||
# For these dirs, add classes.jar and javalib.jar from the dir to platform.zip
|
||||
# all paths under out dir
|
||||
PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
|
||||
target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/android-common_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/core-icu4j_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/ext_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/framework-minus-apex_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \
|
||||
|
||||
# not java libraries
|
||||
PDK_PLATFORM_JAVA_ZIP_CONTENTS += \
|
||||
target/common/obj/APPS/framework-res_intermediates/package-export.apk \
|
||||
target/common/obj/APPS/framework-res_intermediates/src/R.stamp
|
||||
endif # platform-java or FUSION build
|
||||
|
||||
PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \
|
||||
$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR) \
|
||||
$(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR)
|
||||
|
||||
PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\
|
||||
$(lib_dir)/classes.jar $(lib_dir)/classes-header.jar \
|
||||
$(lib_dir)/javalib.jar $(lib_dir)/classes*.dex \
|
||||
$(lib_dir)/classes.dex.toc )
|
||||
|
||||
# check and override java support level
|
||||
ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR),)
|
||||
ifneq ($(wildcard external/proguard),)
|
||||
TARGET_BUILD_JAVA_SUPPORT_LEVEL := sdk
|
||||
else # no proguard
|
||||
TARGET_BUILD_JAVA_SUPPORT_LEVEL :=
|
||||
endif
|
||||
# platform support is set after checking platform.zip
|
||||
endif # PDK
|
||||
|
||||
ifneq (,$(PDK_FUSION_PLATFORM_DIR)$(PDK_FUSION_PLATFORM_ZIP))
|
||||
|
||||
_pdk_fusion_intermediates :=
|
||||
_pdk_fusion_stamp :=
|
||||
_pdk_fusion_file_list :=
|
||||
_pdk_fusion_java_file_list :=
|
||||
PDK_FUSION_SYMLINK_STAMP :=
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_DIR
|
||||
_pdk_fusion_intermediates := $(PDK_FUSION_PLATFORM_DIR)
|
||||
_pdk_fusion_file_list := $(sort \
|
||||
$(shell cd $(PDK_FUSION_PLATFORM_DIR); find * -type f))
|
||||
_pdk_fusion_java_file_list := $(filter target/common/%,$(_pdk_fusion_file_list))
|
||||
_pdk_fusion_file_list := $(filter-out target/common/%,$(_pdk_fusion_file_list))
|
||||
|
||||
PDK_FUSION_SYMLINK_STAMP := $(call intermediates-dir-for, PACKAGING, pdk_fusion)/pdk_symlinks.stamp
|
||||
|
||||
symlink_list := $(sort \
|
||||
$(shell cd $(PDK_FUSION_PLATFORM_DIR); find * -type l))
|
||||
$(PDK_FUSION_SYMLINK_STAMP): PRIVATE_SYMLINKS := $(foreach s,$(symlink_list),\
|
||||
$(s):$(shell readlink $(PDK_FUSION_PLATFORM_DIR)/$(s)))
|
||||
$(PDK_FUSION_SYMLINK_STAMP):
|
||||
$(foreach s,$(PRIVATE_SYMLINKS),\
|
||||
mkdir -p $(PRODUCT_OUT)/$(dir $(call word-colon,1,$(s))) && \
|
||||
ln -sf $(call word-colon,2,$(s)) $(PRODUCT_OUT)/$(call word-colon,1,$(s)) &&) true
|
||||
touch $@
|
||||
|
||||
symlink_list :=
|
||||
endif # PDK_FUSION_PLATFORM_DIR
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_ZIP
|
||||
_pdk_fusion_intermediates := $(call intermediates-dir-for, PACKAGING, pdk_fusion)
|
||||
_pdk_fusion_stamp := $(_pdk_fusion_intermediates)/pdk_fusion.stamp
|
||||
|
||||
_pdk_fusion_file_list := $(shell unzip -Z -1 $(PDK_FUSION_PLATFORM_ZIP) \
|
||||
'*[^/]' -x 'target/common/*' 2>/dev/null)
|
||||
_pdk_fusion_java_file_list := \
|
||||
$(shell unzip -Z -1 $(PDK_FUSION_PLATFORM_ZIP) 'target/common/*' 2>/dev/null)
|
||||
_pdk_fusion_files := $(addprefix $(_pdk_fusion_intermediates)/,\
|
||||
$(_pdk_fusion_file_list) $(_pdk_fusion_java_file_list))
|
||||
|
||||
$(_pdk_fusion_stamp) : $(PDK_FUSION_PLATFORM_ZIP)
|
||||
@echo "Unzip $(dir $@) <- $<"
|
||||
$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
|
||||
$(hide) unzip -qo $< -d $(dir $@)
|
||||
$(call split-long-arguments,-touch,$(_pdk_fusion_files))
|
||||
$(hide) touch $@
|
||||
|
||||
$(_pdk_fusion_files) : $(_pdk_fusion_stamp)
|
||||
endif # PDK_FUSION_PLATFORM_ZIP
|
||||
|
||||
ifneq ($(_pdk_fusion_java_file_list),)
|
||||
# This represents whether java build can use platform API or not
|
||||
# This should not be used in Android.mk
|
||||
TARGET_BUILD_PDK_JAVA_PLATFORM := true
|
||||
ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
|
||||
TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform
|
||||
endif
|
||||
endif
|
||||
|
||||
# Implicit pattern rules to copy the fusion files to the system image directory.
|
||||
# Note that if there is already explicit rule in the build system to generate a file,
|
||||
# the pattern rule will be just ignored by make.
|
||||
# That's desired by us: we want only absent files from the platform zip package.
|
||||
# Copy with the last-modified time preserved, never follow symbolic links.
|
||||
$(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% $(_pdk_fusion_stamp)
|
||||
@mkdir -p $(dir $@)
|
||||
$(hide) rm -rf $@
|
||||
$(hide) cp -fpPR $< $@
|
||||
|
||||
# implicit rules for host java files
|
||||
$(HOST_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/host/common/% $(_pdk_fusion_stamp)
|
||||
@mkdir -p $(dir $@)
|
||||
$(hide) cp -fpPR $< $@
|
||||
|
||||
ifeq (true,$(TARGET_BUILD_PDK_JAVA_PLATFORM))
|
||||
PDK_FUSION_OUT_DIR := $(OUT_DIR)
|
||||
|
||||
define JAVA_dependency_template
|
||||
$(call add-dependency,$(PDK_FUSION_OUT_DIR)/$(strip $(1)),\
|
||||
$(foreach d,$(filter $(2),$(_pdk_fusion_java_file_list)),$(PDK_FUSION_OUT_DIR)/$(d)))
|
||||
endef
|
||||
|
||||
# needs explicit dependency as package-export.apk is not explicitly pulled
|
||||
$(eval $(call JAVA_dependency_template,\
|
||||
target/common/obj/APPS/framework-res_intermediates/src/R.stamp,\
|
||||
target/common/obj/APPS/framework-res_intermediates/package-export.apk))
|
||||
|
||||
# javalib.jar should pull classes.jar as classes.jar is not explicitly pulled.
|
||||
$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
|
||||
$(eval $(call JAVA_dependency_template,$(lib_dir)/javalib.jar,\
|
||||
$(lib_dir)/classes.jar)))
|
||||
|
||||
# implicit rules for all other target files
|
||||
$(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp)
|
||||
@mkdir -p $(dir $@)
|
||||
$(hide) cp -fpPR $< $@
|
||||
endif # TARGET_BUILD_PDK_JAVA_PLATFORM
|
||||
|
||||
ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list))
|
||||
|
||||
endif # PDK_FUSION_PLATFORM_ZIP || PDK_FUSION_PLATFORM_DIR
|
||||
|
||||
ifeq ($(TARGET_BUILD_PDK),true)
|
||||
$(info PDK TARGET_BUILD_JAVA_SUPPORT_LEVEL $(TARGET_BUILD_JAVA_SUPPORT_LEVEL))
|
||||
ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),)
|
||||
# SDK used for Java build under PDK
|
||||
PDK_BUILD_SDK_VERSION := $(lastword $(TARGET_AVAILABLE_SDK_VERSIONS))
|
||||
$(info PDK Build uses SDK $(PDK_BUILD_SDK_VERSION))
|
||||
else # PDK_JAVA
|
||||
$(info PDK Build uses the current platform API)
|
||||
endif # PDK_JAVA
|
||||
endif # BUILD_PDK
|
||||
|
||||
ifneq (,$(filter platform platform-java, $(MAKECMDGOALS))$(filter true,$(TARGET_BUILD_PDK)))
|
||||
# files under $(PRODUCT_OUT)/symbols to help debugging.
|
||||
# Source not included to PDK due to dependency issue, so provide symbols instead.
|
||||
|
||||
PDK_SYMBOL_FILES_LIST :=
|
||||
ifeq ($(TARGET_IS_64_BIT),true)
|
||||
PDK_SYMBOL_FILES_LIST += system/bin/app_process64
|
||||
ifdef TARGET_2ND_ARCH
|
||||
PDK_SYMBOL_FILES_LIST += system/bin/app_process32
|
||||
endif
|
||||
else
|
||||
PDK_SYMBOL_FILES_LIST += system/bin/app_process32
|
||||
endif
|
||||
|
||||
ifneq (,$(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR))
|
||||
# symbols should be explicitly pulled for fusion build
|
||||
$(foreach f,$(filter $(PDK_SYMBOL_FILES_LIST), $(_pdk_fusion_file_list)),\
|
||||
$(eval $(call add-dependency,$(PRODUCT_OUT)/$(f),$(PRODUCT_OUT)/symbols/$(f))))
|
||||
endif # PLATFORM_ZIP || PLATFORM_DIR
|
||||
endif # platform.zip/dir build or PDK
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
# Auto-generate module defitions from platform.zip.
|
||||
# We use these rules to rebuild .odex files of the .jar/.apk inside the platform.zip.
|
||||
#
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_ZIP
|
||||
pdk_dexpreopt_config_mk := $(TARGET_OUT_INTERMEDIATES)/pdk_dexpreopt_config.mk
|
||||
|
||||
$(shell rm -f $(pdk_dexpreopt_config_mk) && mkdir -p $(dir $(pdk_dexpreopt_config_mk)) && \
|
||||
unzip -qo $(PDK_FUSION_PLATFORM_ZIP) -d $(dir $(pdk_dexpreopt_config_mk)) pdk_dexpreopt_config.mk 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifdef PDK_FUSION_PLATFORM_DIR
|
||||
pdk_dexpreopt_config_mk := $(PDK_FUSION_PLATFORM_DIR)/pdk_dexpreopt_config.mk
|
||||
endif
|
||||
|
||||
-include $(pdk_dexpreopt_config_mk)
|
||||
|
||||
# Define a PDK prebuilt module that comes from platform.zip.
|
||||
# Must be called with $(eval)
|
||||
define prebuilt-pdk-java-module
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE:=$(1)
|
||||
LOCAL_MODULE_CLASS:=$(2)
|
||||
# Use LOCAL_PREBUILT_MODULE_FILE instead of LOCAL_SRC_FILES so we don't need to deal with LOCAL_PATH.
|
||||
LOCAL_PREBUILT_MODULE_FILE:=$(3)
|
||||
LOCAL_DEX_PREOPT:=$(4)
|
||||
LOCAL_MULTILIB:=$(5)
|
||||
LOCAL_DEX_PREOPT_FLAGS:=$(6)
|
||||
LOCAL_BUILT_MODULE_STEM:=$(7)
|
||||
LOCAL_MODULE_SUFFIX:=$(suffix $(7))
|
||||
LOCAL_PRIVILEGED_MODULE:=$(8)
|
||||
LOCAL_VENDOR_MODULE:=$(9)
|
||||
LOCAL_MODULE_TARGET_ARCH:=$(10)
|
||||
LOCAL_REPLACE_PREBUILT_APK_INSTALLED:=$(11)
|
||||
LOCAL_CERTIFICATE:=PRESIGNED
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
# The source prebuilts are extracted in the rule of _pdk_fusion_stamp.
|
||||
# Use a touch rule to establish the dependency.
|
||||
ifndef PDK_FUSION_PLATFORM_DIR
|
||||
$(3) $(11) : $(_pdk_fusion_stamp)
|
||||
$(hide) if [ ! -f $$@ ]; then \
|
||||
echo 'Error: $$@ does not exist. Check your platform.zip.' 1>&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
$(hide) touch $$@
|
||||
endif
|
||||
endef
|
||||
|
||||
# We don't have a LOCAL_PATH for the auto-generated modules, so let it be the $(BUILD_SYSTEM).
|
||||
LOCAL_PATH := $(BUILD_SYSTEM)
|
||||
|
||||
##### Java libraries.
|
||||
# Only set up rules for modules that aren't built from source.
|
||||
pdk_prebuilt_libraries := $(foreach l,$(PDK.DEXPREOPT.JAVA_LIBRARIES),\
|
||||
$(if $(MODULE.TARGET.JAVA_LIBRARIES.$(l)),,$(l)))
|
||||
|
||||
$(foreach l,$(pdk_prebuilt_libraries), $(eval \
|
||||
$(call prebuilt-pdk-java-module,\
|
||||
$(l),\
|
||||
JAVA_LIBRARIES,\
|
||||
$(_pdk_fusion_intermediates)/$(PDK.DEXPREOPT.$(l).SRC),\
|
||||
$(PDK.DEXPREOPT.$(l).DEX_PREOPT),\
|
||||
$(PDK.DEXPREOPT.$(l).MULTILIB),\
|
||||
$(PDK.DEXPREOPT.$(l).DEX_PREOPT_FLAGS),\
|
||||
javalib.jar,\
|
||||
)))
|
||||
|
||||
###### Apps.
|
||||
pdk_prebuilt_apps := $(foreach a,$(PDK.DEXPREOPT.APPS),\
|
||||
$(if $(MODULE.TARGET.APPS.$(a)),,$(a)))
|
||||
|
||||
$(foreach a,$(pdk_prebuilt_apps), $(eval \
|
||||
$(call prebuilt-pdk-java-module,\
|
||||
$(a),\
|
||||
APPS,\
|
||||
$(_pdk_fusion_intermediates)/$(PDK.DEXPREOPT.$(a).SRC),\
|
||||
$(PDK.DEXPREOPT.$(a).DEX_PREOPT),\
|
||||
$(PDK.DEXPREOPT.$(a).MULTILIB),\
|
||||
$(PDK.DEXPREOPT.$(a).DEX_PREOPT_FLAGS),\
|
||||
package.apk,\
|
||||
$(PDK.DEXPREOPT.$(a).PRIVILEGED_MODULE),\
|
||||
$(PDK.DEXPREOPT.$(a).VENDOR_MODULE),\
|
||||
$(PDK.DEXPREOPT.$(a).TARGET_ARCH),\
|
||||
$(_pdk_fusion_intermediates)/$(PDK.DEXPREOPT.$(a).STRIPPED_SRC),\
|
||||
)))
|
||||
|
|
@ -52,7 +52,7 @@ endif
|
|||
# We skip it for unbundled app builds where we cannot build veridex.
|
||||
module_run_appcompat :=
|
||||
ifeq (true,$(non_system_module))
|
||||
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
|
||||
ifeq (,$(TARGET_BUILD_APPS)) # ! unbundled app build
|
||||
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
|
||||
module_run_appcompat := true
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ $(call add_json_bool, Allow_missing_dependencies, $(ALLOW_MISSING_DEPENDE
|
|||
$(call add_json_bool, Unbundled_build, $(TARGET_BUILD_UNBUNDLED))
|
||||
$(call add_json_bool, Unbundled_build_apps, $(TARGET_BUILD_APPS))
|
||||
$(call add_json_bool, Always_use_prebuilt_sdks, $(TARGET_BUILD_USE_PREBUILT_SDKS))
|
||||
$(call add_json_bool, Pdk, $(filter true,$(TARGET_BUILD_PDK)))
|
||||
|
||||
$(call add_json_bool, Debuggable, $(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
$(call add_json_bool, Eng, $(filter eng,$(TARGET_BUILD_VARIANT)))
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#
|
||||
|
||||
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)
|
||||
|
|
@ -61,5 +60,4 @@ check-boot-jars : $(stamp)
|
|||
droidcore : check-boot-jars
|
||||
|
||||
endif # PRODUCT_BOOT_JARS
|
||||
endif # TARGET_BUILD_PDK not true
|
||||
endif # SKIP_BOOT_JARS_CHECK not true
|
||||
|
|
|
|||
|
|
@ -31,10 +31,6 @@ check-vndk-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vnd
|
|||
ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|)
|
||||
# TODO(b/110429754) remove this condition when we support 64-bit-only device
|
||||
check-vndk-list: ;
|
||||
else ifeq ($(TARGET_BUILD_PDK),true)
|
||||
# b/118634643: don't check VNDK lib list when building PDK. Some libs (libandroid_net.so
|
||||
# and some render-script related ones) can't be built in PDK due to missing frameworks/base.
|
||||
check-vndk-list: ;
|
||||
else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)
|
||||
check-vndk-list: ;
|
||||
else ifeq ($(BOARD_VNDK_VERSION),)
|
||||
|
|
|
|||
Loading…
Reference in a new issue