openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
platform_build/core/package_internal.mk

751 lines
27 KiB
Makefile
Raw Normal View History

add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
#
# Copyright (C) 2008 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.
#
###########################################################
## Standard rules for building an application package.
##
## Additional inputs from base_rules.make:
## LOCAL_PACKAGE_NAME: The name of the package; the directory
## will be called this.
##
## MODULE, MODULE_PATH, and MODULE_SUFFIX will
## be set for you.
###########################################################
# If this makefile is being read from within an inheritance,
# use the new values.
skip_definition:=
ifdef LOCAL_PACKAGE_OVERRIDES
package_overridden := $(call set-inherited-package-variables)
ifeq ($(strip $(package_overridden)),)
skip_definition := true
endif
endif
ifndef skip_definition
LOCAL_PACKAGE_NAME := $(strip $(LOCAL_PACKAGE_NAME))
ifeq ($(LOCAL_PACKAGE_NAME),)
$(error $(LOCAL_PATH): Package modules must define LOCAL_PACKAGE_NAME)
endif
ifneq ($(strip $(LOCAL_MODULE_SUFFIX)),)
$(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE_SUFFIX)
endif
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
ifneq ($(strip $(LOCAL_MODULE)),)
$(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE)
endif
LOCAL_MODULE := $(LOCAL_PACKAGE_NAME)
ifneq ($(strip $(LOCAL_MODULE_CLASS)),)
$(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS)
endif
LOCAL_MODULE_CLASS := APPS
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
intermediates := $(call local-intermediates-dir)
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Package LOCAL_MODULE_TAGS default to optional
LOCAL_MODULE_TAGS := $(strip $(LOCAL_MODULE_TAGS))
ifeq ($(LOCAL_MODULE_TAGS),)
LOCAL_MODULE_TAGS := optional
endif
ifeq ($(filter tests, $(LOCAL_MODULE_TAGS)),)
# Force localization check if it's not tagged as tests.
LOCAL_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) -z
endif
Allow LOCAL_ASSET_DIR point to nonexistent dir LOCAL_ASSET_DIR may point to a dir generated during the build process. We have done similiar things to LOCAL_RESOURCE_DIR. (cherry picked from commit bfcdf060bab129581acff32eb70896f719162bc9) Bug: 16563899 Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-07-30 01:34:30 +08:00
need_compile_asset :=
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifeq (,$(LOCAL_ASSET_DIR))
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
Allow LOCAL_ASSET_DIR point to nonexistent dir LOCAL_ASSET_DIR may point to a dir generated during the build process. We have done similiar things to LOCAL_RESOURCE_DIR. (cherry picked from commit bfcdf060bab129581acff32eb70896f719162bc9) Bug: 16563899 Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-07-30 01:34:30 +08:00
else
need_compile_asset := true
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
# LOCAL_RESOURCE_DIR may point to resource generated during the build
need_compile_res :=
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifeq (,$(LOCAL_RESOURCE_DIR))
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
else
need_compile_res := true
Clean LOCAL_RESOURCE_DIR paths With LOCAL_USE_AAPT2, resource directories like a/b/../res cause problems, since ninja will canonicalize the path before creating the intermediate resource directory, so it creates <intermediates>/a/res while we give AAPT2 <intermediates>/a/b/../res, which fails to open. Bug: 37716307 Test: Switch LOCAL_USE_AAPT2:=true for TelecommUnitTests, mma Test: lunch aosp_marlin-userdebug; m -j Change-Id: Id0d167e68185a119390e7b7e3c344895e77ca0e3
2017-05-03 14:55:44 +08:00
LOCAL_RESOURCE_DIR := $(foreach d,$(LOCAL_RESOURCE_DIR),$(call clean-path,$(d)))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
include $(BUILD_SYSTEM)/force_aapt2.mk
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
package_resource_overlays := $(strip \
$(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \
$(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))))
Enforce RROs for all the build-time ROs This CL is to generate every static RRO package for its target package automatically at build-time. BOARD_ENFORCE_RRO build variable is added to specify whether enforcing RRO is required or not. BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify the module list of which item should be exempt from enforcing RRO. Test: tested on bullhead and sailfish Bug: 34097942 Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-02-01 23:44:58 +08:00
enforce_rro_enabled :=
Use product-based inclusive rule for enforcing RRO Board-based rule can cause unexpected regression because build-time overlays are different among products. So each product should be tested with its own product-based rule considering its build-time overlays before applying enforcing RRO. Additionally RRO conversion is mandatory only for overlays of which target is included in AOSP system image and is critical for CTS/VTS tests with AOSP system image. So inclusive rule is more suitable instead of exclusive rule to avoid unexpected regression due to unnecessary RRO conversion. Note that we still support conversion for all the overlays by specifying PRODUCT_ENFORCE_RRO_TARGETS as "*". Test: building succeeded and tested with auto-generated RROs. Bug: 36231603 Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
2017-03-30 10:25:02 +08:00
ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
ifneq ($(package_resource_overlays),)
ifeq ($(PRODUCT_ENFORCE_RRO_TARGETS),*)
enforce_rro_enabled := true
else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
Enforce RROs for all the build-time ROs This CL is to generate every static RRO package for its target package automatically at build-time. BOARD_ENFORCE_RRO build variable is added to specify whether enforcing RRO is required or not. BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify the module list of which item should be exempt from enforcing RRO. Test: tested on bullhead and sailfish Bug: 34097942 Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-02-01 23:44:58 +08:00
enforce_rro_enabled := true
endif
endif
ifdef enforce_rro_enabled
ifeq (,$(LOCAL_MODULE_PATH))
ifeq (true,$(LOCAL_PROPRIETARY_MODULE))
enforce_rro_enabled :=
else ifeq (true,$(LOCAL_OEM_MODULE))
enforce_rro_enabled :=
else ifeq (true,$(LOCAL_ODM_MODULE))
enforce_rro_enabled :=
Support /product partition This CL adds the following build flags to support building product partition from Android build system. - BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS - BOARD_AVB_PRODUCT_KEY_PATH - BOARD_AVB_PRODUCT_ALGORITHM - BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION - BOARD_PREBUILT_PRODUCTIMAGE - BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE - BOARD_PRODUCTIMAGE_PARTITION_SIZE - BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE - BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR - BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT - BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN - BOARD_USES_PRODUCTIMAGE - LOCAL_PRODUCT_MODULE - PRODUCT_FOOTER_ARGS - PRODUCT_PRODUCT_BASE_FS_PATH - PRODUCT_PRODUCT_VERITY_PARTITION - TARGET_COPY_OUT_PRODUCT - TARGET_OUT_PRODUCT* And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific properties in /product/build.prop. Bug: 64195575 Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE, BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION. Change-Id: I774e6a38003734421591e51bed103802ff84f432
2017-11-27 16:04:47 +08:00
else ifeq (true,$(LOCAL_PRODUCT_MODULE))
enforce_rro_enabled :=
Enforce RROs for all the build-time ROs This CL is to generate every static RRO package for its target package automatically at build-time. BOARD_ENFORCE_RRO build variable is added to specify whether enforcing RRO is required or not. BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify the module list of which item should be exempt from enforcing RRO. Test: tested on bullhead and sailfish Bug: 34097942 Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-02-01 23:44:58 +08:00
endif
else ifeq ($(filter $(TARGET_OUT)/%,$(LOCAL_MODULE_PATH)),)
enforce_rro_enabled :=
endif
endif
endif
Support excluding overlays when enforcing RRO PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays to be excluded from enforcing RRO. The excluded overlays will be applied into the original package. Bug: 63600240 Bug: 65001751 Test: succeeded building with PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \ vendor/google/google_overlay/static_only \ vendor/google/nexus_overlay/common/static_only and confirmed that config_webview_packages existed in framework-res.apk with the overlayed value, but not in framework-res__auto_generated_rro.apk. Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
2017-09-01 16:23:25 +08:00
ifdef enforce_rro_enabled
ifneq ($(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS),)
static_only_resource_overlays := $(filter $(addsuffix %,$(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS)),$(package_resource_overlays))
ifneq ($(static_only_resource_overlays),)
package_resource_overlays := $(filter-out $(static_only_resource_overlays),$(package_resource_overlays))
LOCAL_RESOURCE_DIR := $(static_only_resource_overlays) $(LOCAL_RESOURCE_DIR)
ifeq ($(package_resource_overlays),)
enforce_rro_enabled :=
endif
endif
endif
else
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
Enforce RROs for all the build-time ROs This CL is to generate every static RRO package for its target package automatically at build-time. BOARD_ENFORCE_RRO build variable is added to specify whether enforcing RRO is required or not. BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify the module list of which item should be exempt from enforcing RRO. Test: tested on bullhead and sailfish Bug: 34097942 Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-02-01 23:44:58 +08:00
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-13 05:06:30 +08:00
all_assets := $(strip \
$(foreach dir, $(LOCAL_ASSET_DIR), \
$(addprefix $(dir)/, \
$(patsubst assets/%,%, \
$(call find-subdir-assets, $(dir)) \
) \
) \
))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Allow LOCAL_ASSET_DIR point to nonexistent dir LOCAL_ASSET_DIR may point to a dir generated during the build process. We have done similiar things to LOCAL_RESOURCE_DIR. (cherry picked from commit bfcdf060bab129581acff32eb70896f719162bc9) Bug: 16563899 Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-07-30 01:34:30 +08:00
ifneq ($(all_assets),)
need_compile_asset := true
endif
Add LOCAL_AAPT2_ONLY This allows modules to specify that they may only be used from modules using aapt2. Using aapt2 removes absolute path references to modules, so this can be useful if a module is preparing to move its sources, or replace itself with a prebuilt aar. Test: m Test: Label frameworks/support/design; m Test: Label frameworks/support/v4; m Test: build/soong/build_test.bash Change-Id: Icfb3d4b19a6a0e3a3bb00091d2a97a4d88c0c761
2017-11-18 07:39:52 +08:00
ifdef LOCAL_AAPT2_ONLY
LOCAL_USE_AAPT2 := true
endif
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
my_res_package :=
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
# In aapt2 the last takes precedence.
my_resource_dirs := $(call reverse-list,$(LOCAL_RESOURCE_DIR))
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
my_res_dir :=
my_overlay_res_dirs :=
ifneq ($(LOCAL_STATIC_ANDROID_LIBRARIES),)
# If we are using static android libraries, every source file becomes an overlay.
# This is to emulate old AAPT behavior which simulated library support.
my_res_dir :=
my_overlay_res_dirs := $(my_resource_dirs)
else
# Without static libraries, the first directory is our directory, which can then be
# overlaid by the rest. (First directory in my_resource_dirs is last directory in
# $(LOCAL_RESOURCE_DIR) due to it being reversed.
my_res_dir := $(firstword $(my_resource_dirs))
my_overlay_res_dirs := $(wordlist 2,999,$(my_resource_dirs))
endif
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
my_overlay_resources := $(strip \
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
$(foreach d,$(my_overlay_res_dirs),\
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(addprefix $(d)/, \
$(call find-subdir-assets,$(d)))))
Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2 causes a warning: build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets Only call find-subdir-assets if my_res_dir is not empty. Also improve the warning message to make it easier to find the module that caused it. Test: m -j Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317
2016-11-30 03:12:56 +08:00
my_res_resources := $(if $(my_res_dir),$(strip \
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(addprefix $(my_res_dir)/, \
Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2 causes a warning: build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets Only call find-subdir-assets if my_res_dir is not empty. Also improve the warning message to make it easier to find the module that caused it. Test: m -j Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317
2016-11-30 03:12:56 +08:00
$(call find-subdir-assets,$(my_res_dir)))))
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
all_resources := $(strip $(my_res_resources) $(my_overlay_resources))
# The linked resource package.
my_res_package := $(intermediates)/package-res.apk
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES We expect to build the module's own packare-res.apk from the LOCAL_STATIC_ANDROID_LIBRARIES in this case. Bug: 25958912 Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9
2016-03-02 04:06:47 +08:00
# Always run aapt2, because we need to at least compile the AndroidManifest.xml.
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
need_compile_res := true
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-25 06:11:55 +08:00
else # LOCAL_USE_AAPT2
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
all_resources := $(strip \
$(foreach dir, $(LOCAL_RESOURCE_DIR), \
$(addprefix $(dir)/, \
$(patsubst res/%,%, \
$(call find-subdir-assets,$(dir)) \
) \
) \
))
Add split support for AAPT2 AAPT2 allows the declaration of a split path, so that build systems don't need to guess the auto-generated name. Construct the split path we want from the configurations passed in to LOCAL_PACKAGE_SPLITS. Bug:30445078 Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
2016-08-13 03:57:17 +08:00
ifdef LOCAL_PACKAGE_SPLITS
LOCAL_AAPT_FLAGS += $(addprefix --split ,$(LOCAL_PACKAGE_SPLITS))
endif
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-25 06:11:55 +08:00
endif # LOCAL_USE_AAPT2
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
ifneq ($(all_resources),)
need_compile_res := true
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
all_res_assets := $(strip $(all_assets) $(all_resources))
# If no assets or resources were found, clear the directory variables so
# we don't try to build them.
Allow LOCAL_ASSET_DIR point to nonexistent dir LOCAL_ASSET_DIR may point to a dir generated during the build process. We have done similiar things to LOCAL_RESOURCE_DIR. (cherry picked from commit bfcdf060bab129581acff32eb70896f719162bc9) Bug: 16563899 Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-07-30 01:34:30 +08:00
ifneq (true,$(need_compile_asset))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_ASSET_DIR:=
endif
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
ifneq (true,$(need_compile_res))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_RESOURCE_DIR:=
R_file_stamp :=
else
# Make sure that R_file_stamp inherits the proper PRIVATE vars.
# If R.stamp moves, be sure to update the framework makefile,
# which has intimate knowledge of its location.
Fix using variable intermediates.COMMON before defining. In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk" forward before the variable intermediates.COMMON gets defined. That's a mistake. This change replaced the tentative variables package_expected_intermediates_COMMON and guessed_intermediates with their proper counterparts defined in base_rules.mk. If their values differ in the two file, that's an error and we should fix. Bug: 18168693 Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-19 06:53:52 +08:00
R_file_stamp := $(intermediates.COMMON)/src/R.stamp
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
endif
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
ifdef LOCAL_COMPRESSED_MODULE
ifneq (true,$(LOCAL_COMPRESSED_MODULE))
$(call pretty-error, Unknown value for LOCAL_COMPRESSED_MODULE $(LOCAL_COMPRESSED_MODULE))
endif
endif
ifdef LOCAL_COMPRESSED_MODULE
apkcerts: Add information about the compressed state of the APK. We add a compressed="$extension" attribute to an APK's entry if it's compressed. Bug: 64531948 Test: make dist Change-Id: Ic3f95ed77f0bb16dec825bae944c70ee2d130657
2017-08-14 17:53:50 +08:00
PACKAGES.$(LOCAL_PACKAGE_NAME).COMPRESSED := gz
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
LOCAL_BUILT_MODULE_STEM := package.apk.gz
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk.gz
else # !LOCAL_COMPRESSED_MODULE
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_BUILT_MODULE_STEM := package.apk
New installation path for apks and their JNIs. Apk's path is changed to <parent_dir>/MyApp/MyApp.apk; JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so. Symlinks of JNIs are changed accordingly. Bug: 16319961 Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
2014-07-18 12:24:42 +08:00
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))
ifndef LOCAL_PROGUARD_ENABLED
ifneq ($(DISABLE_PROGUARD),true)
LOCAL_PROGUARD_ENABLED :=full
endif
endif
ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
# the package explicitly request to disable proguard.
LOCAL_PROGUARD_ENABLED :=
endif
proguard_options_file :=
ifneq ($(LOCAL_PROGUARD_ENABLED),custom)
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
ifeq ($(need_compile_res),true)
Fix using variable intermediates.COMMON before defining. In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk" forward before the variable intermediates.COMMON gets defined. That's a mistake. This change replaced the tentative variables package_expected_intermediates_COMMON and guessed_intermediates with their proper counterparts defined in base_rules.mk. If their values differ in the two file, that's an error and we should fix. Bug: 18168693 Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-19 06:53:52 +08:00
proguard_options_file := $(intermediates.COMMON)/proguard_options
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
endif # need_compile_res
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif # !custom
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
ifeq (true,$(EMMA_INSTRUMENT))
ifndef LOCAL_EMMA_INSTRUMENT
Update to latest jacoco usage Bug: 36792868 Test: EMMA_INSTRUMENT_STATIC=true m -j Change-Id: I419b543283b52be9a72f5c6b10e4cbea68782174
2017-04-12 07:36:46 +08:00
# No jacoco for test apks.
Tag "tests" alone doesn't prevent including emma.jar Only if an app has LOCAL_INSTRUMENTATION_FOR, it can get the emma classes from the target app and we don't need to instrument the test app itself. Change-Id: If0fba50ddae757254fc58ca104d729d61603fd78
2015-11-07 03:22:28 +08:00
ifeq (,$(LOCAL_INSTRUMENTATION_FOR))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
LOCAL_EMMA_INSTRUMENT := true
endif # No test apk
endif # LOCAL_EMMA_INSTRUMENT is not set
else
LOCAL_EMMA_INSTRUMENT := false
endif # EMMA_INSTRUMENT is true
ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
ifeq (true,$(EMMA_INSTRUMENT_STATIC))
Add LOCAL_SRCJARS support Allow java modules to take jars containing .java files as an input. For turbine, pass them directly to turbine. For javac, extract them to a directory and pass a list of the files to javac. Bug: 73885582 Test: m checkbuild Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-08 07:44:54 +08:00
ifneq ($(LOCAL_SRC_FILES)$(LOCAL_SRCJARS)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),)
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
# Only add jacocoagent if the package contains some java code
Support code coverage with Jack Building an app with Jack and with the environment variable EMMA_INSTRUMENT_STATIC set to true will apply code coverage onto the app targeting Jacoco. Bug: 20115492 Change-Id: Ief3640fa3faa466f7f6aaa9739e06d3db24110a0
2015-11-20 00:53:00 +08:00
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
Use proguard.jacoco.flags for EMMA_INSTRUMENT_STATIC Add proguard.jacoco.flags whenever EMMA_INSTRUMENT_STATIC is set so that com.vladium.emma.rt.RT is not stripped. Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true Change-Id: Ie64a283d95e8bbf426cd39675d70a3a58768ebc7
2018-01-04 04:39:11 +08:00
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
endif # Contains java code
else
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifdef LOCAL_SDK_VERSION
ifdef TARGET_BUILD_APPS
Fix code coverage for apps When building apps with EMMA_INSTRUMENT=true, we must ensure that jacoco is at least on the classpath (or even embedded for unbundled branches) and that proguard will ignore jacoco classes. Otherwise the Jack compilation would fail. For unbundled build, we include the proguard configuration file build/core/proguard.jacoco.flags to ignore jacoco classes. For full build, we ensure jacoco is on the classpath during the jack compilation. Bug: 27607712 (cherry picked from commit d9641e01f300ffc359a034a3e897fd8ada78237a) Change-Id: Ib46c91d03721f2418b15c17546d4f322f2f90a28
2016-03-31 22:48:26 +08:00
# In unbundled build, merge the coverage library into the apk.
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),)
# Only add jacocoagent if the package contains some java code
Support code coverage with Jack Building an app with Jack and with the environment variable EMMA_INSTRUMENT_STATIC set to true will apply code coverage onto the app targeting Jacoco. Bug: 20115492 Change-Id: Ief3640fa3faa466f7f6aaa9739e06d3db24110a0
2015-11-20 00:53:00 +08:00
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
Fix code coverage for apps When building apps with EMMA_INSTRUMENT=true, we must ensure that jacoco is at least on the classpath (or even embedded for unbundled branches) and that proguard will ignore jacoco classes. Otherwise the Jack compilation would fail. For unbundled build, we include the proguard configuration file build/core/proguard.jacoco.flags to ignore jacoco classes. For full build, we ensure jacoco is on the classpath during the jack compilation. Bug: 27607712 (cherry picked from commit d9641e01f300ffc359a034a3e897fd8ada78237a) Change-Id: Ib46c91d03721f2418b15c17546d4f322f2f90a28
2016-03-31 22:48:26 +08:00
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
endif # Contains java code
Delete jack support Remove all support for running jack. Bug: 65302138 Test: m -j checkbuild Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631 Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631 (cherry picked from commit 5db5d31d732a04d07052217602790a3fec8208f8)
2017-09-28 05:28:41 +08:00
endif # TARGET_BUILD_APPS
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif # LOCAL_SDK_VERSION
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
endif # EMMA_INSTRUMENT_STATIC
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif # LOCAL_EMMA_INSTRUMENT
rs_compatibility_jni_libs :=
Data-binding integration. - Set up LOCAL_JAVACFLAGS to run annotation processing. - Set up a new intermediate directory $(data_binding_intermediates) to contain data-binding intermediate files. - The annotation generated code is generated to $(data_binding_intermediates)/anno-src. The code will be automatically included by javac, so no need to store it in $(LOCAL_INTERMEDIATE_SOURCE_DIR). - Set up rules to run DATA_BINDING_COMPILER. The generated code will be put in $(LOCAL_INTERMEDIATE_SOURCE_DIR)/data-binding, so that it can be automatically included by $(compile-java); Other generated files are put in in subdirs of $(data_binding_intermediates). The generated resource dir replaces the app's original LOCAL_RESOURCE_DIR. Also fixed transform-jar-to-jack on prebuilt aar. Bug: 19945740 Change-Id: I42d9b0e5cd48cf2dce4488298a960b3c95602beb
2015-04-20 00:55:39 +08:00
ifeq ($(LOCAL_DATA_BINDING),true)
data_binding_intermediates := $(intermediates.COMMON)/data-binding
LOCAL_JAVACFLAGS += -processorpath $(DATA_BINDING_COMPILER) -s $(data_binding_intermediates)/anno-src
LOCAL_STATIC_JAVA_LIBRARIES += databinding-baselibrary
LOCAL_STATIC_JAVA_AAR_LIBRARIES += databinding-library databinding-adapters
data_binding_res_in := $(LOCAL_RESOURCE_DIR)
data_binding_res_out := $(data_binding_intermediates)/res
# Replace with the processed merged res dir.
LOCAL_RESOURCE_DIR := $(data_binding_res_out)
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.databinding.library
endif # LOCAL_DATA_BINDING
Move Support Library dependencies to their own var with resolution Bug: 73250914 Test: make checkbuild Change-Id: Ibdbe2fd140133202b266ca4f233c4d42292fa3df Merged-In: Ibdbe2fd140133202b266ca4f233c4d42292fa3df (cherry picked from commit 53f6b2a80b3dfe66fa149e1f06bd07f12afa62d3)
2018-02-22 00:44:57 +08:00
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
# If the module is a compressed module, we don't pre-opt it because its final
# installation location will be the data partition.
ifdef LOCAL_COMPRESSED_MODULE
LOCAL_DEX_PREOPT := false
endif
Add support for prebuilt AARs. - You can give a .aar as source file to a prebuilt static Java library module. The build system will set up dependencies and rules to extract classes.jar and other resource files. - To build against a prebuilt AAR module, use: LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs> The build system will set up rules to merge the library's AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's resource dirs and link/merge the AAR's classes.jar. Bug: 18168693 Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
2014-10-30 06:48:32 +08:00
include $(BUILD_SYSTEM)/android_manifest.mk
Clear resource_export_package outside conditionals $(resource_export_package) is used by package_internal.mk outside ifeq ($(need_compile_res),true), but only cleared inside the conditional. This causes unnecessary dependencies to be added to an old value of $(resource_export_package). In rare cases, the dependency can be on itself, causing a dependency loop. Bug: 71571462 Test: m checkbuild Change-Id: I9fda7fe3bf9d208ad4ba2f8cdb184034bf43f044
2018-01-05 06:27:36 +08:00
resource_export_package :=
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
include $(BUILD_SYSTEM)/java_renderscript.mk
Move aapt flags from java_common.mk to aapt_flags.mk The aapt flags were being set in java_common.mk, which is used by various entry points. host_dalvik_java_library.mk and host_java_library.mk, and java_library.mk don't support aapt, only package_internal.mk and static_java_library.mk do. Move the aapt flags into aapt_flags.mk, and include it from package_internal.mk and static_java_library.mk. Bug: 73885582 Test: no change to build-${TARGET_PRODUCT}.ninja Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
2018-03-07 10:18:06 +08:00
include $(BUILD_SYSTEM)/aapt_flags.mk
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-26 04:23:58 +08:00
ifeq ($(need_compile_res),true)
Add split support for AAPT2 AAPT2 allows the declaration of a split path, so that build systems don't need to guess the auto-generated name. Construct the split path we want from the configurations passed in to LOCAL_PACKAGE_SPLITS. Bug:30445078 Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
2016-08-13 03:57:17 +08:00
###############################
## APK splits
built_apk_splits :=
installed_apk_splits :=
my_apk_split_configs :=
ifdef LOCAL_PACKAGE_SPLITS
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
ifdef LOCAL_COMPRESSED_MODULE
$(error $(LOCAL_MODULE): LOCAL_COMPRESSED_MODULE is not currently supported for split installs)
endif # LOCAL_COMPRESSED_MODULE
Add split support for AAPT2 AAPT2 allows the declaration of a split path, so that build systems don't need to guess the auto-generated name. Construct the split path we want from the configurations passed in to LOCAL_PACKAGE_SPLITS. Bug:30445078 Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
2016-08-13 03:57:17 +08:00
my_apk_split_configs := $(LOCAL_PACKAGE_SPLITS)
my_split_suffixes := $(subst $(comma),_,$(my_apk_split_configs))
Start deprecating OVERRIDE_BUILT_MODULE_PATH We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 14:38:04 +08:00
built_apk_splits := $(foreach s,$(my_split_suffixes),$(intermediates)/package_$(s).apk)
Add split support for AAPT2 AAPT2 allows the declaration of a split path, so that build systems don't need to guess the auto-generated name. Construct the split path we want from the configurations passed in to LOCAL_PACKAGE_SPLITS. Bug:30445078 Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
2016-08-13 03:57:17 +08:00
endif
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
$(R_file_stamp) $(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)
$(R_file_stamp) $(my_res_package): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)
$(R_file_stamp) $(my_res_package): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)
$(R_file_stamp) $(my_res_package): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)
###############################
## AAPT/AAPT2
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res
Support LOCAL_RENDERSCRIPT_TARGET_API := current Renderscript was using LOCAL_RENDERSCRIPT_TARGET_API := 0 to mean current. Use current instead, and check for it when comparing if LOCAL_RENDERSCRIPT_TARGET_API >= 21. Fixes an issue where LOCAL_RENDERSCRIPT_TARGET_API := 0 was being treated as < 21, causing the renderscript resources to be passed to aapt2: out/target/common/obj/APPS/RSTestBackward_intermediates/flat-res/zip_res.flata.contents/raw/bc32: error: resource file cannot be a directory. Bug: 79481102 Test: m java FORCE_AAPT2=true Change-Id: I7726d0463ce1693bc9653b4d869ced181c491036
2018-05-16 06:15:38 +08:00
ifneq (,$(filter-out current,$(renderscript_target_api)))
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)
my_generated_res_zips := $(rs_generated_res_zip)
endif # renderscript_target_api < 21
endif # renderscript_target_api is set
my_asset_dirs := $(LOCAL_ASSET_DIR)
my_full_asset_paths := $(all_assets)
# Add AAPT2 link specific flags.
$(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)
ifndef LOCAL_AAPT_NAMESPACES
$(my_res_package): PRIVATE_AAPT_FLAGS += --no-static-lib-packages
endif
include $(BUILD_SYSTEM)/aapt2.mk
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-25 06:11:55 +08:00
else # LOCAL_USE_AAPT2
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Use a srcjar for aapt and aapt2 output Dumping files in the *_intermediates/src causes incremental build problems, because we don't know when to delete them if they are no longer generated. Switch to outputting a srcjar instead, and pass it in to the turbine and javac compiles. Bug: 73885582 Test: m checkbuild Change-Id: Ibef28507522339d930c09426d0c98372eb864cb6 Merged-In: Ibef28507522339d930c09426d0c98372eb864cb6 (cherry picked from commit 2d1cddd5674d88c07350a52fa656cc441be04418)
2018-03-09 08:49:16 +08:00
my_srcjar := $(intermediates.COMMON)/aapt.srcjar
LOCAL_SRCJARS += $(my_srcjar)
$(R_file_stamp): PRIVATE_SRCJAR := $(my_srcjar)
$(R_file_stamp): PRIVATE_JAVA_GEN_DIR := $(intermediates.COMMON)/aapt
$(R_file_stamp): .KATI_IMPLICIT_OUTPUTS := $(my_srcjar)
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
# Since we don't know where the real R.java file is going to end up,
# we need to use another file to stand in its place. We'll just
# copy the generated file to src/R.stamp, which means it will
# have the same contents and timestamp as the actual file.
#
# At the same time, this will copy the R.java file to a central
# 'R' directory to make it easier to add the files to an IDE.
#
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
$(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(intermediates.COMMON)/public_resources.xml
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
$(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)
$(R_file_stamp): PRIVATE_RESOURCE_LIST := $(all_res_assets)
Use a srcjar for aapt and aapt2 output Dumping files in the *_intermediates/src causes incremental build problems, because we don't know when to delete them if they are no longer generated. Switch to outputting a srcjar instead, and pass it in to the turbine and javac compiles. Bug: 73885582 Test: m checkbuild Change-Id: Ibef28507522339d930c09426d0c98372eb864cb6 Merged-In: Ibef28507522339d930c09426d0c98372eb864cb6 (cherry picked from commit 2d1cddd5674d88c07350a52fa656cc441be04418)
2018-03-09 08:49:16 +08:00
$(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(rs_generated_res_zip) $(AAPT) $(SOONG_ZIP) | $(ACP)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"
Make sure R.stamp is always created When an app has a resource directory, but the directory contain no resources, R.stamp is not created. This leads to that such apps are always rebuilt, even when there are no changes. This patch changes so that an empty R.stamp is created even if there are no resources. This leads to that affected apps are not rebuilt unless changed. Change-Id: Ia63e5b1913a4456402700b615ba7f9d56d2da852
2015-09-15 21:52:56 +08:00
@rm -rf $@ && mkdir -p $(dir $@)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(create-resource-java-files)
Use a srcjar for aapt and aapt2 output Dumping files in the *_intermediates/src causes incremental build problems, because we don't know when to delete them if they are no longer generated. Switch to outputting a srcjar instead, and pass it in to the turbine and javac compiles. Bug: 73885582 Test: m checkbuild Change-Id: Ibef28507522339d930c09426d0c98372eb864cb6 Merged-In: Ibef28507522339d930c09426d0c98372eb864cb6 (cherry picked from commit 2d1cddd5674d88c07350a52fa656cc441be04418)
2018-03-09 08:49:16 +08:00
$(call find-generated-R.java,$(PRIVATE_JAVA_GEN_DIR),$@)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
$(proguard_options_file): $(R_file_stamp)
ifdef LOCAL_EXPORT_PACKAGE_RESOURCES
# Put this module's resources into a PRODUCT-agnositc package that
# other packages can use to build their own PRODUCT-agnostic R.java (etc.)
# files.
resource_export_package := $(intermediates.COMMON)/package-export.apk
$(R_file_stamp): $(resource_export_package)
# add-assets-to-package looks at PRODUCT_AAPT_CONFIG, but this target
# can't know anything about PRODUCT. Clear it out just for this target.
$(resource_export_package): PRIVATE_PRODUCT_AAPT_CONFIG :=
$(resource_export_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
$(resource_export_package): PRIVATE_RESOURCE_LIST := $(all_res_assets)
Fix incorrect renderscript zip deps Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173. Bug: 73885582 Test: m java FORCE_AAPT2=true Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1
2018-05-16 07:04:47 +08:00
$(resource_export_package): $(all_res_assets) $(full_android_manifest) $(rs_generated_res_zip) $(AAPT)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
@echo "target Export Resources: $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-assets-to-package)
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-25 06:11:55 +08:00
endif # LOCAL_USE_AAPT2
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
endif # need_compile_res
called_from_package_internal := true
#################################
include $(BUILD_SYSTEM)/java.mk
#################################
called_from_package_internal :=
ifeq ($(need_compile_res),true)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Other modules should depend on the BUILT module if
# they want to use this module's R.java file.
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
$(LOCAL_BUILT_MODULE): $(R_file_stamp)
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 06:22:02 +08:00
# The R.java file must exist by the time the java source
# list is generated
$(java_source_list_file): $(R_file_stamp)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
endif # need_compile_res
LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))
ifeq ($(LOCAL_SDK_RES_VERSION),)
LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION)
endif
$(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
ifeq ($(LOCAL_DATA_BINDING),true)
data_binding_stamp := $(data_binding_intermediates)/data-binding.stamp
$(data_binding_stamp): PRIVATE_INTERMEDIATES := $(data_binding_intermediates)
$(data_binding_stamp): PRIVATE_MANIFEST := $(full_android_manifest)
# Generate code into $(LOCAL_INTERMEDIATE_SOURCE_DIR) so that the generated .java files
# will be automatically picked up by function compile-java.
$(data_binding_stamp): PRIVATE_SRC_OUT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/data-binding
$(data_binding_stamp): PRIVATE_XML_OUT := $(data_binding_intermediates)/xml
$(data_binding_stamp): PRIVATE_RES_OUT := $(data_binding_res_out)
$(data_binding_stamp): PRIVATE_RES_IN := $(data_binding_res_in)
$(data_binding_stamp): PRIVATE_ANNO_SRC_DIR := $(data_binding_intermediates)/anno-src
$(data_binding_stamp) : $(all_res_assets) $(full_android_manifest) \
$(DATA_BINDING_COMPILER)
@echo "Data-binding process: $@"
@rm -rf $(PRIVATE_INTERMEDIATES) $(PRIVATE_SRC_OUT) && \
mkdir -p $(PRIVATE_INTERMEDIATES) $(PRIVATE_SRC_OUT) \
$(PRIVATE_XML_OUT) $(PRIVATE_RES_OUT) $(PRIVATE_ANNO_SRC_DIR)
$(hide) $(JAVA) -classpath $(DATA_BINDING_COMPILER) android.databinding.tool.MakeCopy \
$(PRIVATE_MANIFEST) $(PRIVATE_SRC_OUT) $(PRIVATE_XML_OUT) $(PRIVATE_RES_OUT) $(PRIVATE_RES_IN)
$(hide) touch $@
# Make sure the data-binding process happens before javac and generation of R.java.
$(R_file_stamp): $(data_binding_stamp)
$(java_source_list_file): $(data_binding_stamp)
$(full_classes_compiled_jar): $(data_binding_stamp)
endif # LOCAL_DATA_BINDING
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
NO_STANDARD_LIBRARIES := true blocks ALL resource libraries LOCAL_RES_LIBRARIES and LOCAL_APK_LIBRARIES should still be honored. Test: make CtsDevicePrereleaseSdkApp Change-Id: I3360d0fe2f7e2f3038e48f41905923a72609ceec
2018-02-15 08:18:12 +08:00
framework_res_package_export :=
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Most packages should link against the resources defined by framework-res.
# Even if they don't have their own resources, they may use framework
# resources.
Support core_current when exporting resources from a package Bug: 73351844 Test: with https://googleplex-android-review.git.corp.google.com/c/platform/cts/+/3621794 Change-Id: I20b8adf0d7cb5d948ba752e0732bbe84d39a419a
2018-02-17 05:31:17 +08:00
ifeq ($(LOCAL_SDK_RES_VERSION),core_current)
# core_current doesn't contain any framework resources.
else ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# for released sdk versions, the platform resources were built into android.jar.
framework_res_package_export := \
Update make rules to use new android.jar location. This file has been copied into a 'public' subdir. Use that, so that the old file can be deleted. Also introduce a new macro to avoid duplicating this path in a bunch of places. Bug: 77525052 Test: m checkbuild Change-Id: Ifcf59c6fb357769b2765e417c8dd56d2ad9b97aa
2018-04-27 21:11:17 +08:00
$(call resolve-prebuilt-sdk-jar-path,$(LOCAL_SDK_RES_VERSION))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
else # LOCAL_SDK_RES_VERSION
framework_res_package_export := \
$(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
endif # LOCAL_SDK_RES_VERSION
NO_STANDARD_LIBRARIES := true blocks ALL resource libraries LOCAL_RES_LIBRARIES and LOCAL_APK_LIBRARIES should still be honored. Test: make CtsDevicePrereleaseSdkApp Change-Id: I3360d0fe2f7e2f3038e48f41905923a72609ceec
2018-02-15 08:18:12 +08:00
endif # LOCAL_NO_STANDARD_LIBRARIES
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 09:48:27 +08:00
all_library_res_package_exports := \
$(framework_res_package_export) \
Temporarily use a separate var for including shared resources Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
2014-03-26 06:45:34 +08:00
$(foreach lib,$(LOCAL_RES_LIBRARIES),\
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 09:48:27 +08:00
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/package-export.apk)
all_library_res_package_export_deps := \
Remove framework_res_package_export_deps framework_res_package_export is now always either the prebuilt android.jar from an SDK or a package-export.apk generated by Soong, so the dependency on R.stamp is never useful. Remove all assignments to framework_res_package_export_deps, and replace usages with frameworks_res_package_export. Test: m checkbuild Change-Id: If484e9eb08061cb0ed0697755f13db71d741aaab
2018-02-21 06:31:33 +08:00
$(framework_res_package_export) \
Temporarily use a separate var for including shared resources Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
2014-03-26 06:45:34 +08:00
$(foreach lib,$(LOCAL_RES_LIBRARIES),\
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 09:48:27 +08:00
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp)
Reinforce the dependency on package-export.apk. This fixes the bug that if an app has no resource at all, we should still set up the dependency on package-export.apk, because the AndroidManifest.xml may still reference symbols in package-export.apk. Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
2014-06-20 07:07:30 +08:00
$(resource_export_package) $(R_file_stamp) $(LOCAL_BUILT_MODULE): $(all_library_res_package_export_deps)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(LOCAL_INTERMEDIATE_TARGETS): \
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 09:48:27 +08:00
PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(my_res_package) : $(all_library_res_package_export_deps)
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
# These four are set above for $(R_stamp_file) and $(my_res_package), but
# $(LOCAL_BUILT_MODULE) is not set before java.mk, so they have to be set again
# here.
$(LOCAL_BUILT_MODULE): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)
$(LOCAL_BUILT_MODULE): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)
$(LOCAL_BUILT_MODULE): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifneq ($(full_classes_jar),)
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
# Use the jarjar processed arhive as the initial package file.
Move proguard before classes.jar Downstream users of a library always link against javalib.jar, which is either the dex jar for java libraries or a copy of proguard.classes.jar for static java libraries. In preparation for making java libraries a superset of static java libraries, make classes.jar always be the final class-containing jar for use downstream, and always create a classes-pre-proguard.jar for users that need a jar without shrinking or obfuscation. Also rename the intermediates to be consitent: classes-<tool>.jar Bug: 36902714 Test: m -j ANDROID_COMPILE_WITH_JACK=false java Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92 (cherry picked from commit 6fabefa88eb7c0f90e6652c59e46e2fa12b979bb)
2017-03-30 03:58:15 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(LOCAL_BUILT_MODULE): $(built_dex)
Running jarjar on Java resources. Before this change, Java resources are added as a separate step (add-java-resources-to-package) after dex is run, so jarjar isn't run on the resource files. With this change, we add Java resources immediately after we call javac, so jarjar is run on the resource files (the module's own resource, as well as resources carried by static Java libraries). When we generate the final apk/jar, we use the jarjar'ed jar as the inital pacakge file, with class files and empty folders removed. When jack is enabled, in jack-java-to-dex we add the Java resources to a temp jar using the PRIVATE_EXTRA_JAR_ARGS, and extrac the files in a temp dir. Jack will process the resource files and output the result to PRIVATE_JACK_INTERMEDIATES_DIR. When we package the final apk/jar, we need to call add-carried-jack-resources to readd the resources. (TODO: if jack can output all resources to a jar/zip file, we can use that file as the initial package file as well.) Bug: 18837479 Change-Id: I8d7296e30ec8d005054cf04c4f2aed6d7a0d823b
2015-01-15 06:23:56 +08:00
else
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE :=
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE :=
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif # full_classes_jar
Update rules to install JNI libraries. Previously we have to use LOCAL_REQUIRED_MODULES to install jni libraries for an apk in bundled build. With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to install jni shared libraries. The new rules are: - If we are doing unbundled build, or the apk isn't going to be installed to system partitions, we'll embed the jni libs in the built apk. - Otherwise, the jni libraries will be installed to the system lib path, and symlinks created in the app specific lib path. Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
2014-04-18 04:38:04 +08:00
include $(BUILD_SYSTEM)/install_jni_libs.mk
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Pick a key to sign the package with. If this package hasn't specified
# an explicit certificate, use the default.
# Secure release builds will have their packages signed after the fact,
# so it's ok for these private keys to be in the clear.
ifeq ($(LOCAL_CERTIFICATE),)
LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
endif
ifeq ($(LOCAL_CERTIFICATE),EXTERNAL)
# The special value "EXTERNAL" means that we will sign it with the
# default devkey, apply predexopt, but then expect the final .apk
# (after dexopting) to be signed by an outside tool.
LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
PACKAGES.$(LOCAL_PACKAGE_NAME).EXTERNAL_KEY := 1
endif
# If this is not an absolute certificate, assign it to a generic one.
ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./)
LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE)
endif
private_key := $(LOCAL_CERTIFICATE).pk8
certificate := $(LOCAL_CERTIFICATE).x509.pem
Make apks depend on their certificates Bug: 27954979 Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 15:03:24 +08:00
additional_certificates := $(foreach c,$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(LOCAL_BUILT_MODULE): $(private_key) $(certificate) $(SIGNAPK_JAR)
$(LOCAL_BUILT_MODULE): PRIVATE_PRIVATE_KEY := $(private_key)
$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE := $(certificate)
PACKAGES.$(LOCAL_PACKAGE_NAME).PRIVATE_KEY := $(private_key)
PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
Make apks depend on their certificates Bug: 27954979 Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 15:03:24 +08:00
$(LOCAL_BUILT_MODULE): $(additional_certificates)
$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Define the rule to build the actual package.
Support to add JNI of both archs in multilib build. Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in multilib build. The build system will package jni of both archs to the apk, or install them to the right location on the system image and create symlinks, extract .so files from prebuilt apk, etc if appropriate. Bug: 15849902 Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
2014-06-25 11:01:52 +08:00
# PRIVATE_JNI_SHARED_LIBRARIES is a list of <abi>:<path_of_built_lib>.
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)
# PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names.
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifneq ($(TARGET_BUILD_APPS),)
# Include all resources for unbundled apps.
LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
endif
ifeq ($(LOCAL_AAPT_INCLUDE_ALL_RESOURCES),true)
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
$(my_res_package) $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_CONFIG :=
$(my_res_package) $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
else
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
$(my_res_package) $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_CONFIG := $(PRODUCT_AAPT_CONFIG)
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set Bug: 16319961 Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-31 04:40:14 +08:00
ifdef LOCAL_PACKAGE_SPLITS
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
$(my_res_package) $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set Bug: 16319961 Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-31 04:40:14 +08:00
else
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-27 03:13:43 +08:00
$(my_res_package) $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG)
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
endif
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set Bug: 16319961 Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-31 04:40:14 +08:00
endif
Revert "Revert "Copy resources from classes.jar when using AAPT2"" This reverts commit a7e336d17a4a59d908e4bae53da2a12f455b12dc. Reapplies I6649f7f2fbf63ff5001f4731e22960f857726c70 with fix for jack builds. Bug: 64272170 Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L93000000088657848&nodeType=Trybot Change-Id: Id66aebfc2c26a4467e6cf25e4372080882f0b286 Merged-In: Id66aebfc2c26a4467e6cf25e4372080882f0b286 (cherry picked from commit 6fedebf9364e5af731aafc7c1a529f2e27c6725f)
2017-08-03 11:17:34 +08:00
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS)
Revert "Revert "Copy resources from classes.jar when using AAPT2"" This reverts commit a7e336d17a4a59d908e4bae53da2a12f455b12dc. Reapplies I6649f7f2fbf63ff5001f4731e22960f857726c70 with fix for jack builds. Bug: 64272170 Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L93000000088657848&nodeType=Trybot Change-Id: Id66aebfc2c26a4467e6cf25e4372080882f0b286 Merged-In: Id66aebfc2c26a4467e6cf25e4372080882f0b286 (cherry picked from commit 6fedebf9364e5af731aafc7c1a529f2e27c6725f)
2017-08-03 11:17:34 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/resources
$(LOCAL_BUILT_MODULE): PRIVATE_FULL_CLASSES_JAR := $(full_classes_jar)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(LOCAL_BUILT_MODULE) : $(jni_shared_libraries)
Sort files in directories passed to jar jar -C <dir> . produces a jar containing files in filesystem order, which can vary between builds. Manually find and sort the list of files, and convert them into a list of -C <dir> <file> pairs. Fixes: 64634025 Test: m -j checkbuild Test: m -j out/target/product/sailfish/system/framework/ext.jar, check that entries are sorted Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac Change-Id: I7dced6acbe621a60cd49daf17872941485602732
2017-08-11 06:24:10 +08:00
$(LOCAL_BUILT_MODULE) : $(JAR_ARGS)
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package)
$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2) | $(ACP)
else
Fix incremental aapt builds If a resource was moved / removed without any other timestamp updates, ninja would not re-run aapt. To fix this, add a list of resource files into the same command as aapt (echo ... >/dev/null). That way if the list changes, ninja will recognize the command line changing and rerun aapt. Bug: 67315436 Test: mmma cts/tests/autofillservice Test: mv cts/tests/autofillservice/res/layout/welcome_activity.xml \ cts/tests/autofillservice/res/layout/welcome_activity_test.xml Test: mmma cts/tests/autofillservice Change-Id: Ia93ac4ff48910fed74a1f1539ce4e1f5a9db023f
2017-10-03 05:22:02 +08:00
$(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_LIST := $(all_res_assets)
Add a product variable for priv-apps dependencies. Those dependencies are jars/apks on which we want to uncompress their dexs. bug: 30972906 bug: 63920015 Test: sailfish build Change-Id: Ic96ffe9dbe39abc1c28e7de134892d689207c9ca
2017-09-19 20:10:31 +08:00
$(LOCAL_BUILT_MODULE) : $(all_res_assets) $(full_android_manifest) $(AAPT) $(ZIPALIGN)
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 19:46:30 +08:00
endif # LOCAL_USE_AAPT2
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
ifdef LOCAL_COMPRESSED_MODULE
$(LOCAL_BUILT_MODULE) : $(MINIGZIP)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
@echo "target Package: $(PRIVATE_MODULE) ($@)"
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-05 05:59:18 +08:00
$(call copy-file-to-new-target)
Merge commit '1f07720f8518236e8438ae0f25ea7211da8c8c45' into manual_merge_1f07720 Change-Id: I5ad50aacbe99b4ebf8ae7e630f169100128b5b3c
2016-04-01 01:10:42 +08:00
else # ! LOCAL_USE_AAPT2
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-22 06:29:13 +08:00
$(if $(PRIVATE_SOURCE_ARCHIVE),\
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\
$(create-empty-package))
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(add-assets-to-package)
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-25 06:11:55 +08:00
endif # LOCAL_USE_AAPT2
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifneq ($(jni_shared_libraries),)
$(add-jni-shared-libs-to-package)
endif
Add back Java resources to apk without Java code. With commit 33360dd56925276e4526f5f52c26423e2bb1a670 we moved Java resource packaging forward to creation of the jar file. But the Java resource packaging will be skipped if a module has no Java code at all. (The build system does support building an apk without Java code.) In this change we add back the Java resources directly to the built apk when the apk has no Java code. Bug: 19947218 Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
2015-03-28 02:07:17 +08:00
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))
Rebuild odex files in PDK fusion build. To rebuild odex files of Java libraries and apps, we store the jars/apks without stripping the classes.dex inside the platform.zip. We also save the build variables that may affect how we rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip. We store the files and configuration only for libraries/apps that get installed to the system.img (or vendor.img). In PDK fusion build, we auto-generate prebuilt module definitions for the javalib.jar and package.dex.apk carried in the platform.zip, using configuration stored in pdk_dexpreopt_config.mk. With the prebult modules, we override the implicit rule that directly copies the odex from the platform.zip. To rebuild odex of javalib.jar, we added support for prebuilt shared Java library to prebiult_internal.mk. An installable prebuilt Java library is treated as shared Java library, i.e. with classes.dex in the jar instead of a set of .class files. For apks in the platform.zip, we install the stripped version from platform files inside platform.zip, instead of the package.dex.apk, using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't strip package.dex.apk because we can't re-sign the stripped apk at this point. We generate prebuilt module only if it's not already defined in the source tree. Bug: 27543283 Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
2016-03-12 02:32:01 +08:00
else # full_classes_jar
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
$(add-dex-to-package)
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-10 04:29:51 +08:00
ifeq ($(LOCAL_USE_AAPT2),true)
Revert "Revert "Copy resources from classes.jar when using AAPT2"" This reverts commit a7e336d17a4a59d908e4bae53da2a12f455b12dc. Reapplies I6649f7f2fbf63ff5001f4731e22960f857726c70 with fix for jack builds. Bug: 64272170 Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L93000000088657848&nodeType=Trybot Change-Id: Id66aebfc2c26a4467e6cf25e4372080882f0b286 Merged-In: Id66aebfc2c26a4467e6cf25e4372080882f0b286 (cherry picked from commit 6fedebf9364e5af731aafc7c1a529f2e27c6725f)
2017-08-03 11:17:34 +08:00
$(call add-jar-resources-to-package,$@,$(PRIVATE_FULL_CLASSES_JAR),$(PRIVATE_RESOURCE_INTERMEDIATES_DIR))
endif
Rebuild odex files in PDK fusion build. To rebuild odex files of Java libraries and apps, we store the jars/apks without stripping the classes.dex inside the platform.zip. We also save the build variables that may affect how we rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip. We store the files and configuration only for libraries/apps that get installed to the system.img (or vendor.img). In PDK fusion build, we auto-generate prebuilt module definitions for the javalib.jar and package.dex.apk carried in the platform.zip, using configuration stored in pdk_dexpreopt_config.mk. With the prebult modules, we override the implicit rule that directly copies the odex from the platform.zip. To rebuild odex of javalib.jar, we added support for prebuilt shared Java library to prebiult_internal.mk. An installable prebuilt Java library is treated as shared Java library, i.e. with classes.dex in the jar instead of a set of .class files. For apks in the platform.zip, we install the stripped version from platform files inside platform.zip, instead of the package.dex.apk, using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't strip package.dex.apk because we can't re-sign the stripped apk at this point. We generate prebuilt module only if it's not already defined in the source tree. Bug: 27543283 Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
2016-03-12 02:32:01 +08:00
endif # full_classes_jar
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 19:46:30 +08:00
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
@# No need to align, sign-package below will do it.
$(uncompress-dexs)
endif
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifdef LOCAL_DEX_PREOPT
Rebuild odex files in PDK fusion build. To rebuild odex files of Java libraries and apps, we store the jars/apks without stripping the classes.dex inside the platform.zip. We also save the build variables that may affect how we rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip. We store the files and configuration only for libraries/apps that get installed to the system.img (or vendor.img). In PDK fusion build, we auto-generate prebuilt module definitions for the javalib.jar and package.dex.apk carried in the platform.zip, using configuration stored in pdk_dexpreopt_config.mk. With the prebult modules, we override the implicit rule that directly copies the odex from the platform.zip. To rebuild odex of javalib.jar, we added support for prebuilt shared Java library to prebiult_internal.mk. An installable prebuilt Java library is treated as shared Java library, i.e. with classes.dex in the jar instead of a set of .class files. For apks in the platform.zip, we install the stripped version from platform files inside platform.zip, instead of the package.dex.apk, using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't strip package.dex.apk because we can't re-sign the stripped apk at this point. We generate prebuilt module only if it's not already defined in the source tree. Bug: 27543283 Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
2016-03-12 02:32:01 +08:00
ifneq ($(BUILD_PLATFORM_ZIP),)
@# Keep a copy of apk with classes.dex unstripped
$(hide) cp -f $@ $(dir $@)package.dex.apk
endif # BUILD_PLATFORM_ZIP
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
ifneq (nostripping,$(LOCAL_DEX_PREOPT))
$(call dexpreopt-remove-classes.dex,$@)
endif
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 19:46:30 +08:00
endif # LOCAL_DEX_PREOPT
Move package signing after file stripping For dex preopt and JNI library extraction, we should remove the classes.dex and .so files before we sign the APK so that there isn't an entry in the manifest. Prebuilt APKs which are pre-signed will simply not have the files removed. This may cause some system.img bloat, but signature checks make this necessary. Bug: 20247329 Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
2015-04-16 03:09:32 +08:00
$(sign-package)
Implement LOCAL_COMPRESSED_MODULE. - Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that define LOCAL_COMPRESSED_MODULE := true will be installed compressed in the system partition. - The compression algorithm is simple gzip for now. In addition : - Compressed modules are not dex-preopted. - JNI shared libraries are always embedded inside compressed modules, they are never installed as separate files on the FS. Test: Manual Bug: 63802184 Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-07 19:31:17 +08:00
ifdef LOCAL_COMPRESSED_MODULE
$(compress-package)
endif # LOCAL_COMPRESSED_MODULE
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
Support to build dpi-specific apk variants. In unbundled apps_only build, in addition to the base apk, you can also build the dpi-specific apk variants, with: LOCAL_DPI_VARIANTS := <a list of dpi names> Previously user needs to include $(BUILD_PACKAGE) repeatedly with the same package definition except dpi flags. With this change, all the dpi-specific apk variants share the base apk's compiled Java code and only diverge at the point we add resources/assets to the apk. Also we set up variables/targets/rules in a way those dpi-specific apks appear to be independent apks to the users, for example, you can pass "AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its own intermediate directory. Bug: 18388705 Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
2014-12-02 09:46:56 +08:00
###############################
## Build dpi-specific apks, if it's apps_only build.
ifdef TARGET_BUILD_APPS
ifdef LOCAL_DPI_VARIANTS
$(foreach d, $(LOCAL_DPI_VARIANTS), \
$(eval my_dpi := $(d)) \
$(eval include $(BUILD_SYSTEM)/dpi_specific_apk.mk))
endif
endif
Split the rules to build the odex file Previously the odex file is byproduct generated by the package.apk rule. Though we have the odex file depend on the package.apk it doesn't have its own build recipe. In case package.apk isn't updated but we still need to update the odex file (such as changed LOCAL_MULTILIB), the odex file will never be rebuilt. This change split out the rules to build the odex file and make sure the build recipe get executed if the odex file needs rebuild. Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
2014-05-22 07:13:33 +08:00
###############################
## Rule to build the odex file
ifdef LOCAL_DEX_PREOPT
$(built_odex): PRIVATE_DEX_FILE := $(built_dex)
Support to build apk odex for both arch. Build odex for both arch in multilib build if an app has LOCAL_MULTILIB := both. Refactored the common setup code to a separate file setup_one_odex.mk. Bug: 17409149 Bug: 14694978 Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
2014-09-14 02:26:39 +08:00
# Use pattern rule - we may have multiple built odex files.
$(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(built_dex)
Fix pattern rules for $(installed_odex) for libdvm. When the VM is libdvm, we don't put the odex files in an arch specific subdirectory. The previous pattern rules don't work because of the extra "/". With this change, % evaluates to empty string when it's built for libdvm; % evaluates to "<arch_name>/" when it's built for libart. Also removed use of $(create-empty-package), which may causes file name (dummy) conflict with the rule of package.apk. Bug: 15311527 Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
2014-05-29 04:34:59 +08:00
$(hide) mkdir -p $(dir $@) && rm -f $@
Split the rules to build the odex file Previously the odex file is byproduct generated by the package.apk rule. Though we have the odex file depend on the package.apk it doesn't have its own build recipe. In case package.apk isn't updated but we still need to update the odex file (such as changed LOCAL_MULTILIB), the odex file will never be rebuilt. This change split out the rules to build the odex file and make sure the build recipe get executed if the odex file needs rebuild. Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
2014-05-22 07:13:33 +08:00
$(add-dex-to-package)
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 19:46:30 +08:00
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
$(uncompress-dexs)
$(align-package)
endif
Split the rules to build the odex file Previously the odex file is byproduct generated by the package.apk rule. Though we have the odex file depend on the package.apk it doesn't have its own build recipe. In case package.apk isn't updated but we still need to update the odex file (such as changed LOCAL_MULTILIB), the odex file will never be rebuilt. This change split out the rules to build the odex file and make sure the build recipe get executed if the odex file needs rebuild. Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
2014-05-22 07:13:33 +08:00
$(hide) mv $@ $@.input
$(call dexpreopt-one-file,$@.input,$@)
$(hide) rm $@.input
endif
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
###############################
## APK splits
ifdef LOCAL_PACKAGE_SPLITS
Improve rules of split apks. - Better messaging if the expected split apk isn't generated by the aapt command in the base apk rule; Remove the built base apk, so make will rerun aapt after the user changes the splitting parameters. - Use cleaner static pattern rules instead of running $(foreach) with $(eval). Bug: 16319961 Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-24 01:27:57 +08:00
# The splits should have been built in the same command building the base apk.
Do not run zipalign when building APK (except prebuilts). This changes the build system to no longer run zipalign except for those prebuilts which do not need to re-signed. Running zipalign is no longer needed because signapk takes care of alignment. For those prebuilts which do not need to be re-signed signapk is not invoked and thus zipalign is still needed because the prebuilts may not have been aligned properly. This exemption will go away once prebuilts are properly aligned. Bug: 25794543 Change-Id: I31f10af80b9baa3c9481cb36f41e5e5046e852f9
2015-12-05 02:07:41 +08:00
# This rule just runs signing.
Improve rules of split apks. - Better messaging if the expected split apk isn't generated by the aapt command in the base apk rule; Remove the built base apk, so make will rerun aapt after the user changes the splitting parameters. - Use cleaner static pattern rules instead of running $(foreach) with $(eval). Bug: 16319961 Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-24 01:27:57 +08:00
# Note that we explicily check the existence of the split apk and remove the
# built base apk if the split apk isn't there.
# That way the build system will rerun the aapt after the user changes the splitting parameters.
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
$(built_apk_splits): PRIVATE_PRIVATE_KEY := $(private_key)
$(built_apk_splits): PRIVATE_CERTIFICATE := $(certificate)
Start deprecating OVERRIDE_BUILT_MODULE_PATH We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 14:38:04 +08:00
$(built_apk_splits) : $(intermediates)/%.apk : $(LOCAL_BUILT_MODULE)
Improve rules of split apks. - Better messaging if the expected split apk isn't generated by the aapt command in the base apk rule; Remove the built base apk, so make will rerun aapt after the user changes the splitting parameters. - Use cleaner static pattern rules instead of running $(foreach) with $(eval). Bug: 16319961 Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-24 01:27:57 +08:00
$(hide) if [ ! -f $@ ]; then \
echo 'No $@ generated, check your apk splitting parameters.' 1>&2; \
rm $<; exit 1; \
fi
$(sign-package)
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
# Rules to install the splits
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 08:21:36 +08:00
installed_apk_splits := $(foreach s,$(my_split_suffixes),$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)
Start deprecating OVERRIDE_BUILT_MODULE_PATH We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 14:38:04 +08:00
$(installed_apk_splits) : $(my_module_path)/$(LOCAL_MODULE)_%.apk : $(intermediates)/package_%.apk
Improve rules of split apks. - Better messaging if the expected split apk isn't generated by the aapt command in the base apk rule; Remove the built base apk, so make will rerun aapt after the user changes the splitting parameters. - Use cleaner static pattern rules instead of running $(foreach) with $(eval). Bug: 16319961 Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-24 01:27:57 +08:00
@echo "Install: $@"
$(copy-file-to-new-target)
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
# Register the additional built and installed files.
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits)
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \
Start deprecating OVERRIDE_BUILT_MODULE_PATH We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 14:38:04 +08:00
$(foreach s,$(my_split_suffixes),$(intermediates)/package_$(s).apk:$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
# Make sure to install the splits when you run "make <module_name>".
Replace usages of my_register_name with my_all_targets A few module types add extra dependencies on $(my_register_name), move them to $(my_all_targets) so that they are built for mm and mma too. Bug: 31526036 Test: mmm framework Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595
2016-09-21 07:01:28 +08:00
$(my_all_targets): $(installed_apk_splits)
Add support for LOCAL_COMPATIBILITY_SUITE A module can specify itself to be a Compatibility Suite module with: LOCAL_COMPATIBILITY_SUITE := <cts-name> <cts-name> can be "cts" or any other cts name supported by the build system. The cts name's config.mk must define global variable COMPATIBILITY_TESTCASES_OUT_<cts-name> to point to the testcase output directory. This change copies the module's built file, as well as the module's AndroidTest.xml, to the testcase output directory. The build system collects all the testcase files in a global variable COMPATIBILITY.<cts-name>.FILES, which you can reference in a build task that builds the suite's zip package. Also copy over the test case files if user runs mm/mmm/etc. Change-Id: Ica0dbc4f193db7de7d395b9c686733bdac41f566
2015-06-04 03:43:50 +08:00
ifdef LOCAL_COMPATIBILITY_SUITE
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. 1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a testcase to belong to multiple suites. 2) Building testcases no longer fails if COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This testcase will just not output to that directory. This will be utilized by the device-tests and general-tests suites that don't require any extra output besides the common testcase directory. Bug: 35394351 Test: 1) Added multiple *TS testcases to cts & vts and verified they ended up in the common directory and each suite's testcase directory. Specifically tested CtsSplitApp to ensure the split usecase still works as well. 2) Added a CTS testcase to the device-tests suite, built device-tests and verified the cts/android-cts/testcases copy was not produced. Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
2017-02-17 10:04:10 +08:00
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(foreach s,$(my_split_suffixes),\
Start deprecating OVERRIDE_BUILT_MODULE_PATH We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 14:38:04 +08:00
$(intermediates)/package_$(s).apk:$(dir)/$(LOCAL_MODULE)_$(s).apk))))
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. 1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a testcase to belong to multiple suites. 2) Building testcases no longer fails if COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This testcase will just not output to that directory. This will be utilized by the device-tests and general-tests suites that don't require any extra output besides the common testcase directory. Bug: 35394351 Test: 1) Added multiple *TS testcases to cts & vts and verified they ended up in the common directory and each suite's testcase directory. Specifically tested CtsSplitApp to ensure the split usecase still works as well. 2) Added a CTS testcase to the device-tests suite, built device-tests and verified the cts/android-cts/testcases copy was not produced. Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
2017-02-17 10:04:10 +08:00
$(call create-suite-dependencies)
Add support for LOCAL_COMPATIBILITY_SUITE A module can specify itself to be a Compatibility Suite module with: LOCAL_COMPATIBILITY_SUITE := <cts-name> <cts-name> can be "cts" or any other cts name supported by the build system. The cts name's config.mk must define global variable COMPATIBILITY_TESTCASES_OUT_<cts-name> to point to the testcase output directory. This change copies the module's built file, as well as the module's AndroidTest.xml, to the testcase output directory. The build system collects all the testcase files in a global variable COMPATIBILITY.<cts-name>.FILES, which you can reference in a build task that builds the suite's zip package. Also copy over the test case files if user runs mm/mmm/etc. Change-Id: Ica0dbc4f193db7de7d395b9c686733bdac41f566
2015-06-04 03:43:50 +08:00
endif # LOCAL_COMPATIBILITY_SUITE
Support LOCAL_PACKAGE_SPLITS. Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-23 06:42:11 +08:00
endif # LOCAL_PACKAGE_SPLITS
add support for module supported or unsupported target architectures Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-07 06:45:37 +08:00
# Save information about this package
PACKAGES.$(LOCAL_PACKAGE_NAME).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
PACKAGES.$(LOCAL_PACKAGE_NAME).RESOURCE_FILES := $(all_resources)
PACKAGES := $(PACKAGES) $(LOCAL_PACKAGE_NAME)
endif # skip_definition
# Reset internal variables.
all_res_assets :=
Enforce RROs for all the build-time ROs This CL is to generate every static RRO package for its target package automatically at build-time. BOARD_ENFORCE_RRO build variable is added to specify whether enforcing RRO is required or not. BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify the module list of which item should be exempt from enforcing RRO. Test: tested on bullhead and sailfish Bug: 34097942 Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-02-01 23:44:58 +08:00
ifdef enforce_rro_enabled
ifdef LOCAL_EXPORT_PACKAGE_RESOURCES
enforce_rro_use_res_lib := true
else
enforce_rro_use_res_lib := false
endif
ifdef LOCAL_MANIFEST_PACKAGE_NAME
enforce_rro_is_manifest_package_name := true
enforce_rro_manifest_package_info := $(LOCAL_MANIFEST_PACKAGE_NAME)
else
enforce_rro_is_manifest_package_name := false
enforce_rro_manifest_package_info := $(full_android_manifest)
endif
$(call append_enforce_rro_sources, \
$(my_register_name), \
$(enforce_rro_is_manifest_package_name), \
$(enforce_rro_manifest_package_info), \
$(enforce_rro_use_res_lib), \
$(package_resource_overlays) \
)
Use product-based inclusive rule for enforcing RRO Board-based rule can cause unexpected regression because build-time overlays are different among products. So each product should be tested with its own product-based rule considering its build-time overlays before applying enforcing RRO. Additionally RRO conversion is mandatory only for overlays of which target is included in AOSP system image and is critical for CTS/VTS tests with AOSP system image. So inclusive rule is more suitable instead of exclusive rule to avoid unexpected regression due to unnecessary RRO conversion. Note that we still support conversion for all the overlays by specifying PRODUCT_ENFORCE_RRO_TARGETS as "*". Test: building succeeded and tested with auto-generated RROs. Bug: 36231603 Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
2017-03-30 10:25:02 +08:00
endif # enforce_rro_enabled