a83fc0e482
replaced TARGET_CPU_ADI with TARGET_CPU_ABI
BUG: 110492064
this cl does not impact real devices
Test:
nohup make -j100 ANDROID_USE_BUILDCACHE=false PRODUCT-sdk_gphone_x86-sdk_addon showcommands dist DIST_DIR=${PWD}/dist/x86 sdk_repo
unzip the image package sdk-repo-linux-system-images-eng.zip and make sure userdata.img is inside
Change-Id: I24101c78d789c9b72132efc41a2e98d5274b5ff1
144 lines
6.3 KiB
Makefile
144 lines
6.3 KiB
Makefile
# Copyright (C) 2009 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.
|
|
|
|
|
|
# If they didn't define PRODUCT_SDK_ADDON_NAME, then we won't define
|
|
# any of these rules.
|
|
addon_name := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_NAME))
|
|
ifneq ($(addon_name),)
|
|
|
|
addon_dir_leaf := $(addon_name)-$(FILE_NAME_TAG)-$(INTERNAL_SDK_HOST_OS_NAME)
|
|
addon_dir_img := $(addon_dir_leaf)-img
|
|
intermediates := $(HOST_OUT_INTERMEDIATES)/SDK_ADDON/$(addon_name)_intermediates
|
|
full_target := $(HOST_OUT_SDK_ADDON)/$(addon_dir_leaf).zip
|
|
full_target_img := $(HOST_OUT_SDK_ADDON)/$(addon_dir_img).zip
|
|
staging := $(intermediates)
|
|
|
|
sdk_addon_deps :=
|
|
files_to_copy :=
|
|
|
|
define stub-addon-jar-file
|
|
$(subst .jar,_stub-addon.jar,$(1))
|
|
endef
|
|
|
|
define stub-addon-jar
|
|
$(call stub-addon-jar-file,$(1)): $(1) | mkstubs
|
|
$(info Stubbing addon jar using $(PRODUCT_SDK_ADDON_STUB_DEFS))
|
|
$(hide) $(JAVA) -jar $(call module-installed-files,mkstubs) $(if $(hide),,--v) \
|
|
"$$<" "$$@" @$(PRODUCT_SDK_ADDON_STUB_DEFS)
|
|
endef
|
|
|
|
# Files that are built and then copied into the sdk-addon
|
|
ifneq ($(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_MODULES)),)
|
|
$(foreach cf,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_MODULES), \
|
|
$(eval _src := $(call module-stubs-files,$(call word-colon,1,$(cf)))) \
|
|
$(eval $(call stub-addon-jar,$(_src))) \
|
|
$(eval _src := $(call stub-addon-jar-file,$(_src))) \
|
|
$(if $(_src),,$(eval $(error Unknown or unlinkable module: $(call word-colon,1,$(cf)). Requested by $(INTERNAL_PRODUCT)))) \
|
|
$(eval _dest := $(call word-colon,2,$(cf))) \
|
|
$(eval files_to_copy += $(addon_dir_leaf):$(_src):$(_dest)) \
|
|
)
|
|
endif
|
|
|
|
# Files that are copied directly into the sdk-addon
|
|
ifneq ($(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES)),)
|
|
$(foreach cf,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES), \
|
|
$(eval _src := $(call word-colon,1,$(cf))) \
|
|
$(eval _dest := $(call word-colon,2,$(cf))) \
|
|
$(if $(findstring images/,$(_dest)), $(eval _root := $(addon_dir_img)), $(eval _root := $(addon_dir_leaf))) \
|
|
$(eval files_to_copy += $(_root):$(_src):$(_dest)) \
|
|
)
|
|
endif
|
|
|
|
# Files copied in the system-image directory
|
|
files_to_copy += \
|
|
$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
|
|
$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \
|
|
$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
|
|
$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
|
|
$(addon_dir_img):device/generic/goldfish/data/etc/userdata.img:images/$(TARGET_CPU_ABI)/userdata.img \
|
|
$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \
|
|
$(addon_dir_img):$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP):images/source.properties
|
|
|
|
# Generate rules to copy the requested files
|
|
$(foreach cf,$(files_to_copy), \
|
|
$(eval _root := $(call word-colon,1,$(cf))) \
|
|
$(eval _src := $(call word-colon,2,$(cf))) \
|
|
$(eval _dest := $(call append-path,$(call append-path,$(staging),$(_root)),$(call word-colon,3,$(cf)))) \
|
|
$(eval $(call copy-one-file,$(_src),$(_dest))) \
|
|
$(eval sdk_addon_deps += $(_dest)) \
|
|
)
|
|
|
|
# The system-image source.properties is a template that we directly expand in-place
|
|
addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)/source.properties
|
|
sdk_addon_deps += $(addon_img_source_prop)
|
|
|
|
$(addon_img_source_prop): $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP)
|
|
@echo Generate $@
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) sed \
|
|
-e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
|
|
-e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
|
|
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
|
|
-e 's/$${TARGET_ARCH}/$(TARGET_ARCH)/' \
|
|
-e 's/$${TARGET_CPU_ABI}/$(TARGET_CPU_ABI)/' \
|
|
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
|
|
|
|
|
|
# We don't know about all of the docs files, so depend on the timestamps for
|
|
# them, and record the directories, and the packaging rule will just copy the
|
|
# whole thing.
|
|
doc_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULES))
|
|
sdk_addon_deps += $(foreach dm, $(doc_modules), $(call doc-timestamp-for, $(dm)))
|
|
$(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules))
|
|
|
|
$(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf))
|
|
|
|
$(full_target): $(sdk_addon_deps) | $(ACP) $(SOONG_ZIP)
|
|
@echo Packaging SDK Addon: $@
|
|
$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs
|
|
$(hide) for d in $(PRIVATE_DOCS_DIRS); do \
|
|
$(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\
|
|
done
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)
|
|
|
|
$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)
|
|
$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP) $(SOONG_ZIP)
|
|
@echo Packaging SDK Addon System-Image: $@
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data
|
|
$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)
|
|
|
|
|
|
.PHONY: sdk_addon
|
|
sdk_addon: $(full_target) $(full_target_img)
|
|
|
|
ifneq ($(sdk_repo_goal),)
|
|
# If we're building the sdk_repo, keep the name of the addon zip
|
|
# around so that development/build/tools/sdk_repo.mk can dist it
|
|
# at the appropriate location.
|
|
ADDON_SDK_ZIP := $(full_target)
|
|
ADDON_SDK_IMG_ZIP := $(full_target_img)
|
|
else
|
|
# When not building an sdk_repo, just dist the addon zip file
|
|
# as-is.
|
|
$(call dist-for-goals, sdk_addon, $(full_target))
|
|
endif
|
|
|
|
else # addon_name
|
|
ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
|
|
$(error Trying to build sdk_addon, but product '$(INTERNAL_PRODUCT)' does not define one)
|
|
endif
|
|
endif # addon_name
|