tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/package_internal.mk

732 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-06 23:45:37 +01: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.
###########################################################
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)
Disallow setting LOCAL_MODULE_STEM for android packages LOCAL_MODULE_STEM is not used in the packaging code, except when setting PACKAGES.$(LOCAL_MODULE).STEM. Having this disconnect between PACKAGES.$(LOCAL_MODULE).STEM and the actual name of the apk causes an apk signing step to fail. Other module types like BUILD_HEADER_LIBRARY explicetly disallow setting LOCAL_MODULE_STEM, so we can also just do that for packages. Fixes: 204027319 Test: Presubmits Change-Id: Ib3da9a8dd6792a6c9d725cb24b835b32dbb13c40
2021-11-05 20:28:33 +01:00
ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),)
$(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM)
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-06 23:45:37 +01:00
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-04 22:59:18 +01: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-06 23:45:37 +01: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-29 19:34:30 +02: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-06 23:45:37 +01: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-29 19:34:30 +02: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-06 23:45:37 +01:00
endif
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02: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-06 23:45:37 +01: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-25 22:23:58 +02: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 08:55:44 +02: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-06 23:45:37 +01:00
endif
Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES It is a list of <module_name>:<manifest_name> pairs. When the module name of an APK or an APEX matches with <module_name>, then its app manifest name is overridden to <manifest_name>. <module_name> and <manifest_name> can be patterns as in com.android.%:com.mycompany.android.%.release Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for 1) an APK in Android.mk 2) an APK in ANdroid.bp 3) an APEX and check that manifest names are modified as specified Change-Id: Ic09e059ea7b7ea99a50a1cf423a25aa587ef4466
2019-01-05 04:57:54 +01:00
# If LOCAL_MODULE matches a rule in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES,
Fix typo in some comments Test: no need Change-Id: I68620689f1a2eb2eca67e11b55dc781e7744859e
2019-01-15 17:07:35 +01:00
# override the manifest package name by the (first) rule matched
Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES It is a list of <module_name>:<manifest_name> pairs. When the module name of an APK or an APEX matches with <module_name>, then its app manifest name is overridden to <manifest_name>. <module_name> and <manifest_name> can be patterns as in com.android.%:com.mycompany.android.%.release Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for 1) an APK in Android.mk 2) an APK in ANdroid.bp 3) an APEX and check that manifest names are modified as specified Change-Id: Ic09e059ea7b7ea99a50a1cf423a25aa587ef4466
2019-01-05 04:57:54 +01:00
override_manifest_name := $(strip $(word 1,\
$(foreach rule,$(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES),\
$(eval _pkg_name_pat := $(call word-colon,1,$(rule)))\
$(eval _manifest_name_pat := $(call word-colon,2,$(rule)))\
$(if $(filter $(_pkg_name_pat),$(LOCAL_MODULE)),\
$(patsubst $(_pkg_name_pat),$(_manifest_name_pat),$(LOCAL_MODULE))\
)\
)\
))
ifneq (,$(override_manifest_name))
Fix typo in some comments Test: no need Change-Id: I68620689f1a2eb2eca67e11b55dc781e7744859e
2019-01-15 17:07:35 +01:00
# Note: this can override LOCAL_MANIFEST_PACKAGE_NAME value set in Android.mk
Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES It is a list of <module_name>:<manifest_name> pairs. When the module name of an APK or an APEX matches with <module_name>, then its app manifest name is overridden to <manifest_name>. <module_name> and <manifest_name> can be patterns as in com.android.%:com.mycompany.android.%.release Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for 1) an APK in Android.mk 2) an APK in ANdroid.bp 3) an APEX and check that manifest names are modified as specified Change-Id: Ic09e059ea7b7ea99a50a1cf423a25aa587ef4466
2019-01-05 04:57:54 +01:00
LOCAL_MANIFEST_PACKAGE_NAME := $(override_manifest_name)
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-09 22:29:51 +02:00
include $(BUILD_SYSTEM)/force_aapt2.mk
Move manifest generation logic into static_java_library.mk Previously a manifest file would be generated for static_java_library.mk and package_internal.mk. For pacakge_internal.mk, this would cause cryptic errors like b/188612215#2 With this CL, a manifest file would only be generated for java_library with need_compile_res == true. The advantages are 1. No redundant generation for java_library with need_compile_res == false (i.e. modules that do not require aapt2) 2. Force devs to provide manifest for android_app, and not silently generating one for them Bug: 188652897 Test: TH Test: m nothing in tv-dev, car-dev Change-Id: I69a23e373f1b4ac1569ae5b1d36067bfc0dadc05
2021-11-02 04:54:05 +01:00
# validate that app contains a manifest file for aapt2
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
$(call pretty-error,App missing manifest file which is required by aapt2. \
Provide a manifest file by either setting LOCAL_MANIFEST_FILE in Android.mk \
or via a AndroidManifest.xml in this directory)
endif
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-09 22:29:51 +02:00
Move support library dependency munging earlier The presence of LOCAL_STATIC_ANDROID_LIBRARIES is used early to decide whether to move resources to overlays, and late to decide whether to add --auto-add-overlay. If support_libraries.mk moves the last LOCAL_STATIC_ANDROID_LIBRARIES value to LOCAL_STATIC_JAVA_LIBRARIES then the resources will be moved to overlays but --auto-add-overlay will not be added, causing aapt2 to fail with: error: resource bool/leanback_outline_clipping_disabled does not override an existing resource. note: define an <add-resource> tag or use --auto-add-overlay. Bug: 79481102 Test: m FORCE_AAPT2=true java Change-Id: Icc67acf23b846bd506a5d397d02ad5775ad0ea1d
2018-05-18 00:05:47 +02:00
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
# Determine whether auto-RRO is enabled for this package.
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 16:44:58 +01:00
enforce_rro_enabled :=
Change RRO enforcement logic Change RRO logic from "Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS is '*'" to "Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS includes '*'" Bug: b/137727426 Test: test build on local machine Change-Id: I10b215c28919988ec58deb1fe3d5498ad4e73eb4
2019-10-01 06:55:26 +02:00
ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
Make RRO packages for system_ext Until now, packages from system_ext don't create RRO packages, instead it uses static overlay, but to make system_ext common, it should use RRO. Bug: 150820813 Test: m && check if there are RRO packages that use from system_ext apps Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-09 04:31:23 +01:00
# * means all system and system_ext APKs, so enable conditionally based on module path.
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
# Note that base_rules.mk has not yet been included, so it's likely that only
# one of LOCAL_MODULE_PATH and the LOCAL_X_MODULE flags has been set.
ifeq (,$(LOCAL_MODULE_PATH))
Make RRO packages for system_ext Until now, packages from system_ext don't create RRO packages, instead it uses static overlay, but to make system_ext common, it should use RRO. Bug: 150820813 Test: m && check if there are RRO packages that use from system_ext apps Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-09 04:31:23 +01:00
non_rro_target_module := $(filter true,\
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
$(LOCAL_ODM_MODULE) \
$(LOCAL_OEM_MODULE) \
$(LOCAL_PRODUCT_MODULE) \
$(LOCAL_PROPRIETARY_MODULE) \
$(LOCAL_VENDOR_MODULE))
Make RRO packages for system_ext Until now, packages from system_ext don't create RRO packages, instead it uses static overlay, but to make system_ext common, it should use RRO. Bug: 150820813 Test: m && check if there are RRO packages that use from system_ext apps Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-09 04:31:23 +01:00
enforce_rro_enabled := $(if $(non_rro_target_module),,true)
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
else ifneq ($(filter $(TARGET_OUT)/%,$(LOCAL_MODULE_PATH)),)
Add comments and slight refactor auto-RRO logic Make it a bit clearer what this code is intended to do. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: Ic405fc5d4601b9f0a91b4d24caa06f279267c51a
2019-03-14 19:53:58 +01:00
enforce_rro_enabled := true
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 16:44:58 +01:00
endif
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
enforce_rro_enabled := true
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 16:44:58 +01:00
endif
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
product_package_overlays := $(strip \
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
$(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))))
device_package_overlays := $(strip \
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
$(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))))
static_resource_overlays :=
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
runtime_resource_overlays_product :=
runtime_resource_overlays_vendor :=
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 10:23:25 +02:00
ifdef enforce_rro_enabled
ifneq ($(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS),)
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
# The PRODUCT_ exclusion variable applies to both inclusion variables..
static_resource_overlays += $(filter $(addsuffix %,$(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS)),$(product_package_overlays))
static_resource_overlays += $(filter $(addsuffix %,$(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS)),$(device_package_overlays))
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 10:23:25 +02:00
endif
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
runtime_resource_overlays_product := $(filter-out $(static_resource_overlays),$(product_package_overlays))
runtime_resource_overlays_vendor := $(filter-out $(static_resource_overlays),$(device_package_overlays))
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 10:23:25 +02:00
else
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
static_resource_overlays := $(product_package_overlays) $(device_package_overlays)
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 16:44:58 +01: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-06 23:45:37 +01:00
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
# Add the static overlays. Auto-RRO is created later, as it depends on
# other logic in this file.
LOCAL_RESOURCE_DIR := $(static_resource_overlays) $(LOCAL_RESOURCE_DIR)
resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-12 22:06:30 +01: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-06 23:45:37 +01: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-29 19:34:30 +02:00
ifneq ($(all_assets),)
need_compile_asset := 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-26 20:13:43 +01:00
my_res_package :=
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-04 22:59:18 +01: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-26 20:13:43 +01:00
my_res_dir :=
my_overlay_res_dirs :=
Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2 LOCAL_STATIC_JAVA_AAR_LIBRARIES are slightly different from LOCAL_STATIC_ANDROID_LIBRARIES, due to b/78447299 the AndroidManifest.xml from ANDROID libraries are ignored. Temporarily add support for LOCAL_STATIC_JAVA_AAR_LIBRARIES when using LOCAL_USE_AAPT2 := true, treating them the same as LOCAL_STATIC_ANDROID_LIBRARIES except that they are merged by android_manifest.xml Bug: 78447299 Bug: 79481102 Test: m FORCE_AAPT2=true checkbuild Change-Id: Ia6210810c1ea6e776be97ae1c9a586b5de844125
2018-05-23 22:35:53 +02:00
ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
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-26 20:13:43 +01:00
# 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-04 22:59:18 +01: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-26 20:13:43 +01: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-04 22:59:18 +01: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-29 20:12:56 +01: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-04 22:59:18 +01: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-29 20:12:56 +01: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-04 22:59:18 +01: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)
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
my_bundle_module := $(intermediates)/base.zip
LOCAL_INTERMEDIATE_TARGETS += $(my_bundle_module)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
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-01 21:06:47 +01: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-04 22:59:18 +01:00
need_compile_res := true
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02: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-06 23:45:37 +01: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-29 19:34:30 +02: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-06 23:45:37 +01:00
LOCAL_ASSET_DIR:=
endif
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02: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-06 23:45:37 +01: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-18 23:53:52 +01: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-06 23:45:37 +01: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 13:31:17 +02: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 11:53:50 +02: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 13:31:17 +02: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-06 23:45:37 +01: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 06:24:42 +02: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 13:31:17 +02: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-06 23:45:37 +01: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-25 22:23:58 +02: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-18 23:53:52 +01: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-25 22:23:58 +02: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-06 23:45:37 +01:00
endif # !custom
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
Add dependencies for files in LOCAL_PROGUARD_FLAGS Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS. An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES, but that would have been much harder to ensure the same command line ordering. Bug: 130111713 Test: treehugger Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 18:14:45 +02:00
LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_options_file)
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-06 23:45:37 +01:00
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 01:36:46 +02: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-06 20:22:28 +01: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-06 23:45:37 +01: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 00:44:54 +01: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-21 23:29:13 +01: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-19 17:53:00 +01: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-03 21:39:11 +01:00
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
Add dependencies for files in LOCAL_PROGUARD_FLAGS Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS. An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES, but that would have been much harder to ensure the same command line ordering. Bug: 130111713 Test: treehugger Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 18:14:45 +02:00
LOCAL_PROGUARD_FLAGS_DEPS += $(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-21 23:29:13 +01: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-06 23:45:37 +01: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 16:48:26 +02: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-21 23:29:13 +01: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-19 17:53:00 +01: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 16:48:26 +02:00
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
Add dependencies for files in LOCAL_PROGUARD_FLAGS Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS. An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES, but that would have been much harder to ensure the same command line ordering. Bug: 130111713 Test: treehugger Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 18:14:45 +02:00
LOCAL_PROGUARD_FLAGS_DEPS += $(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-21 23:29:13 +01: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-27 23:28:41 +02: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-06 23:45:37 +01: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-21 23:29:13 +01: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-06 23:45:37 +01:00
endif # LOCAL_EMMA_INSTRUMENT
rs_compatibility_jni_libs :=
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 13:31:17 +02: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
Make manifest and APK agree on uncompressed native libs Only put uncompressed native libs in an APK if the min_sdk_version supports it (>= 23, Marshmallow), and set android:extractNativeLibs="false" in the AndroidManifest.xml so that the platform won't extract them anyways. Bug: 117618214 Test: m checkbuild Change-Id: Iae26e4676c29c68fa3f76187512c82786bfa0522
2019-02-07 01:36:32 +01:00
# Default to use uncompressed native libraries in APKs if minSdkVersion >= marshmallow
ifndef LOCAL_USE_EMBEDDED_NATIVE_LIBS
LOCAL_USE_EMBEDDED_NATIVE_LIBS := $(call math_gt_or_eq, \
$(patsubst $(PLATFORM_VERSION_CODENAME),100,$(call module-min-sdk-version)),23)
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-29 23:48:32 +01: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-04 23:27:36 +01: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 01:21:36 +01: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 03:18:06 +01: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-25 22:23:58 +02: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-12 21:57:17 +02: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 13:31:17 +02: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-12 21:57:17 +02: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 08:38:04 +02: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-12 21:57:17 +02:00
endif
Allow passing --legacy in LOCAL_AAPT_FLAGS --legacy will soon no longer be passed by default to all aapt2 compiles. Allow it to be specified in LOCAL_AAPT_FLAGS by passing it to aapt2 compile when it is present and filtering it out from the flags passed to aapt2 link. Bug: 135597368 Test: m java Change-Id: I92792cf6a0d4c6ecf5e0971523bd0ab76c81345f
2019-06-22 22:03:09 +02:00
$(R_file_stamp) $(my_res_package): PRIVATE_AAPT_FLAGS := $(filter-out --legacy,$(LOCAL_AAPT_FLAGS))
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 01:21:36 +01:00
$(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)
###############################
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
## AAPT2
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 01:21:36 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res
ifneq (,$(filter-out current,$(renderscript_target_api)))
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 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-06 23:45:37 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
# Add AAPT2 link specific flags.
ifndef LOCAL_AAPT_NAMESPACES
$(my_res_package): PRIVATE_AAPT_FLAGS += --no-static-lib-packages
endif
include $(BUILD_SYSTEM)/aapt2.mk
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-04 22:59:18 +01: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 01:21:36 +01:00
endif # need_compile_res
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
my_dex_jar := $(intermediates.COMMON)/dex.jar
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 01:21:36 +01:00
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-06 23:45:37 +01: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-21 23:29:13 +01:00
$(LOCAL_BUILT_MODULE): $(R_file_stamp)
java_source_list_file is only created when full_classses_jar is set So avoid creating an unused phony target when we aren't compiling anything. Test: treehugger Change-Id: I4e6d9d93ee5a7d11db6b4a6c7da1ba947d96e575
2020-04-29 00:55:49 +02:00
ifneq ($(full_classes_jar),)
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 00:22:02 +02:00
# The R.java file must exist by the time the java source
# list is generated
$(java_source_list_file): $(R_file_stamp)
java_source_list_file is only created when full_classses_jar is set So avoid creating an unused phony target when we aren't compiling anything. Test: treehugger Change-Id: I4e6d9d93ee5a7d11db6b4a6c7da1ba947d96e575
2020-04-29 00:55:49 +02: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-06 23:45:37 +01: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 01:21:36 +01: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)
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 01:18:12 +01: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-06 23:45:37 +01: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-16 22:31:17 +01:00
ifeq ($(LOCAL_SDK_RES_VERSION),core_current)
# core_current doesn't contain any framework resources.
Introduce TARGET_BUILD_UNBUNDLED_IMAGE - TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but its targets are the unbundled partitions instead of apps. - Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS because it is used even without TARGET_BUILD_APPS. -Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS to build java modules with prebuilt sdks, and propagate to Soong. Bug: 160390776 Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
2020-07-08 11:10:38 +02:00
else ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_USE_PREBUILT_SDKS),$(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-06 23:45:37 +01: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 15:11:17 +02: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-06 23:45:37 +01: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 01:18:12 +01:00
endif # LOCAL_NO_STANDARD_LIBRARIES
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 02:48:27 +01:00
all_library_res_package_exports := \
$(framework_res_package_export) \
Temporarily use a separate var for including shared resources Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
2014-03-25 23:45:34 +01:00
$(foreach lib,$(LOCAL_RES_LIBRARIES),\
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 02:48:27 +01: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-20 23:31:33 +01:00
$(framework_res_package_export) \
Temporarily use a separate var for including shared resources Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
2014-03-25 23:45:34 +01:00
$(foreach lib,$(LOCAL_RES_LIBRARIES),\
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 02:48:27 +01: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 01:07:30 +02: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-06 23:45:37 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): \
Add LOCAL_APK_LIBRARIES to the AAPT -I flag Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-14 02:48:27 +01: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-04 22:59:18 +01:00
$(my_res_package) : $(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-06 23:45:37 +01: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-21 23:29:13 +01: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-29 21:58:15 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar)
Fix some java library dependencies Bug: 130111713 Test: treehugger Test: build system image w/RBE Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d
2019-06-12 23:18:31 +02:00
$(LOCAL_BUILT_MODULE): $(built_dex) $(full_classes_pre_proguard_jar)
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-14 23:23:56 +01: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-21 23:29:13 +01: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-06 23:45:37 +01: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-17 22:38:04 +02: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-06 23:45:37 +01: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
Dump and enforce certificate for apks Dump the list of APKs that aren't located at system partition and signed with system certificate. And when enforcement option is enabled, it makes build error if there is the apk that satisfies the condition above. Bug: 74699609 Test: m -j Test: m out/target/product/$(get_build_var TARGET_DEVICE)/certificate_violation_modules.txt Change-Id: I23c41f2665dd97abac3e77d1c82d81ff91b894eb
2018-12-17 06:45:15 +01:00
include $(BUILD_SYSTEM)/app_certificate_validate.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-06 23:45:37 +01:00
private_key := $(LOCAL_CERTIFICATE).pk8
certificate := $(LOCAL_CERTIFICATE).x509.pem
Make apks depend on their certificates Bug: 27954979 Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 09:03:24 +02: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-06 23:45:37 +01:00
Use more variables from Soong Remove more copies of variables that are computed by Soong. Test: m checkbuild Change-Id: If78d4650438cc91d00c691db2fc97c5b790d5648
2019-08-08 21:56:01 +02:00
$(LOCAL_BUILT_MODULE): $(private_key) $(certificate) $(SIGNAPK_JAR) $(SIGNAPK_JNI_LIBRARY_PATH)
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-06 23:45:37 +01:00
$(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 09:03:24 +02: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-06 23:45:37 +01:00
Add signing certificate lineage file support. Also add multi-cert support to prebuilt apps so that they can benefit from the new lineage feature. (This is a cherry-pick change.) Test: m GoogleServicesFramework w/ modified build rules Test: m PrebuiltGmsCore w/ modified build rules Test: apksigner lineage -v --print-certs -in <built_module_path> Fixes: 152897457 Change-Id: If7d5d4bd308629c8340231520214c76c8a568a65 Merged-In: If7d5d4bd308629c8340231520214c76c8a568a65
2020-04-02 22:01:08 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_LINEAGE)
$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
Add ability to set --rotation-min-sdk-version for signapk. Bug: 197787352 Test: m signapk Change-Id: I3b5e9bb3985c2ae83381499a44b339a7b1deb05c
2021-10-20 17:37:23 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
Build merged apexkeys.txt/apkcerts.txt by partition. Propagate partition tag data to apexkeys.txt and apkcerts.txt so that merge_target_files.py can build merged versions of these files by filtering the framework files for framework partitions and filtering the vendor files for vendor partitions. Bug: 138942268 Change-Id: Ic3226728e97dae84d38ec230ccc86d1b124bea94
2020-03-21 02:31:43 +01:00
# Set a actual_partition_tag (calculated in base_rules.mk) for the package.
PACKAGES.$(LOCAL_PACKAGE_NAME).PARTITION := $(actual_partition_tag)
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-06 23:45:37 +01: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 05:01:52 +02: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-06 23:45:37 +01: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-26 20:13:43 +01: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-06 23:45:37 +01: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-26 20:13:43 +01: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-30 22:40:14 +02: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-26 20:13:43 +01: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-30 22:40:14 +02: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-26 20:13:43 +01: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-06 23:45:37 +01:00
endif
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set Bug: 16319961 Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-30 22:40:14 +02: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 05:17:34 +02:00
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
# Run veridex on product, system_ext and vendor modules.
Do not run veridex on unbundled app builds Unbundled app builds do not build the framework, only apps against the prebuilt public API. Running veridex from the local tree does, however, depend on the framework to generate the list of non-SDK APIs. Disable veridex on such builds and remove appcompat.zip from artifacts. Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I16289adc7fc660109d61260e8a49e992228e727c
2018-07-31 12:31:30 +02:00
# We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat :=
Define non-system module as variable Define non_system_module in base_rules.mk when the module is product, vendor, product_services or proprietary module. Bug: 74699609 Test: m -j Change-Id: Iebdd3ec8c643be3d9877b7a96cbdd83465fa3878
2019-01-18 07:09:09 +01:00
ifeq (true,$(non_system_module))
Remove obsolete PDK build functionality This hasn't worked for a couple years, and continues to bitrot. Just remove it. Test: treehugger Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991 Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-05-29 00:46:33 +02:00
ifeq (,$(TARGET_BUILD_APPS)) # ! unbundled app build
Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true Fixes: 122957987 Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true make droid Change-Id: Iafef8cc69971fd10718882326fbba99a6223d0f8
2019-01-15 18:30:51 +01:00
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
Do not run veridex on unbundled app builds Unbundled app builds do not build the framework, only apps against the prebuilt public API. Running veridex from the local tree does, however, depend on the framework to generate the list of non-SDK APIs. Disable veridex on such builds and remove appcompat.zip from artifacts. Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I16289adc7fc660109d61260e8a49e992228e727c
2018-07-31 12:31:30 +02:00
module_run_appcompat := true
endif
endif
Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true Fixes: 122957987 Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true make droid Change-Id: Iafef8cc69971fd10718882326fbba99a6223d0f8
2019-01-15 18:30:51 +01:00
endif
Do not run veridex on unbundled app builds Unbundled app builds do not build the framework, only apps against the prebuilt public API. Running veridex from the local tree does, however, depend on the framework to generate the list of non-SDK APIs. Disable veridex on such builds and remove appcompat.zip from artifacts. Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I16289adc7fc660109d61260e8a49e992228e727c
2018-07-31 12:31:30 +02:00
ifeq ($(module_run_appcompat),true)
Fix installclean incremental builds w/veridex $(HOST_OUT)/obj/PACKAGING is cleaned via `installclean`, so regular built modules should not be depending on it. Explicitly call out the dependencies instead. Test: m; m installclean; m Change-Id: I0f318257e4742d6b7bd099dc06958ca8aba0cfb8
2018-09-17 23:36:37 +02:00
$(LOCAL_BUILT_MODULE) : $(appcompat-files)
Run appcompat on vendor and product-services. Also add some more relevant information at the beginning of each report, to make triaging of the reports easier. To test this I declared ExactCalculator as LOCAL_PRODUCT_SERVICES_MODULE, and this is the resulting log: """ Package name: com.android.calculator2 Module name in Android tree: ExactCalculator Local path in Android tree: packages/apps/ExactCalculator Install path on aosp_marlin-eng: out/target/product/marlin/system/product-services/app/ExactCalculator/ExactCalculator.apk appcompat.sh output: NOTE: appcompat.sh is still under development. It can report API uses that do not execute at runtime, and reflection uses that do not exist. It can also miss on reflection uses. 1: Reflection light greylist Landroid/os/Bundle;->getIBinder use(s): Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder; 2: Reflection light greylist Landroid/view/View;->mAccessibilityDelegate use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->hasAccessibilityDelegate(Landroid/view/View;)Z 3: Reflection light greylist Landroid/view/View;->mMinHeight use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->getMinimumHeight(Landroid/view/View;)I 4: Reflection light greylist Landroid/view/View;->mMinWidth use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->getMinimumWidth(Landroid/view/View;)I 4 hidden API(s) used: 0 linked against, 4 through reflection 0 in blacklist 0 in dark greylist 4 in light greylist To run an analysis that can give more reflection accesses, but could include false positives, pass the --imprecise flag. """ Test: m (also on internal) Bug: 110073830 Change-Id: I5114f51d1ab163e954fcffb159ef335abc289cf6
2018-07-31 16:29:13 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
Run appcompat on all /product modules. The output of the appcompat tool is store on $(PRODUCT_OUT)/appcompat. Bug: 110073830 Bug: 78924201 Test: m Change-Id: Ia77cc53fc241a048958cf243ba298298f800f933
2018-07-13 17:44:28 +02: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 05:17:34 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/resources
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-04 22:59:18 +01:00
$(LOCAL_BUILT_MODULE) : $(jni_shared_libraries)
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(LOCAL_BUILT_MODULE) : $(JAR_ARGS) $(SOONG_ZIP) $(MERGE_ZIPS) $(ZIP2ZIP)
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-04 22:59:18 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package)
Convert more uses of $(ACP) to `cp` Test: treehugger Change-Id: Id8365ce4c06dfe731be9b80f805e071fab522909
2019-05-29 00:36:47 +02:00
$(LOCAL_BUILT_MODULE) : $(my_res_package) $(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 13:31:17 +02: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-04 22:59:18 +01:00
endif
Use zip2zip for uncompress-dexs and uncompress-shared-libs Unzipping and rezipping files causes the umask of the host machine to affect the permissions in the APK. Use the new zip2zip -0 feature to rewrite the zip file with selected files uncompressed. Bug: 69500920 Test: m checkbuild Change-Id: I82dd3aa441712772a1d1ddd6aaf5f41179facaa7
2018-10-08 06:32:07 +02:00
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
$(LOCAL_BUILT_MODULE) : $(ZIP2ZIP)
endif
Add dependencies on java resources when packaging APK without classes When an APK is packaged without any classes.dex files the resources are packaged directly, and so the packaging rule must depend on the resources. Fixes: 177295654 Test: prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_cf_x86_64_phone.ninja -t query out/target/product/vsoc_x86_64/obj/APPS/CtsSplitApp_x86_64_intermediates/package.apk Change-Id: I786e71439f11e7bd5e20e010b66fbf529eb57a5a
2021-01-13 00:08:08 +01:00
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
$(LOCAL_BUILT_MODULE): $(java_resource_sources)
endif
Make manifest and APK agree on uncompressed native libs Only put uncompressed native libs in an APK if the min_sdk_version supports it (>= 23, Marshmallow), and set android:extractNativeLibs="false" in the AndroidManifest.xml so that the platform won't extract them anyways. Bug: 117618214 Test: m checkbuild Change-Id: Iae26e4676c29c68fa3f76187512c82786bfa0522
2019-02-07 01:36:32 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_USE_EMBEDDED_NATIVE_LIBS := $(LOCAL_USE_EMBEDDED_NATIVE_LIBS)
Fix PDK builds $OUT/obj/APPS/SystemUI_intermediates/package.dex.apk was not being written after being converted to Soong. Add a copy rule for it to soong_app_prebuilt.mk, add it as an implicit output to the Make rules that create it, and add it as a real dependency to the platform.zip rules. Test: m platform Change-Id: I96f58d3d80b764a51a6acb87e92498589cfe5c18
2018-09-29 01:19:42 +02:00
$(LOCAL_BUILT_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-06 23:45:37 +01:00
@echo "target Package: $(PRIVATE_MODULE) ($@)"
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
rm -rf $@.parts
mkdir -p $@.parts
Fix PDK builds $OUT/obj/APPS/SystemUI_intermediates/package.dex.apk was not being written after being converted to Soong. Add a copy rule for it to soong_app_prebuilt.mk, add it as an implicit output to the Make rules that create it, and add it as a real dependency to the platform.zip rules. Test: m platform Change-Id: I96f58d3d80b764a51a6acb87e92498589cfe5c18
2018-09-29 01:19:42 +02:00
cp -f $(PRIVATE_RES_PACKAGE) $@.parts/apk.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-06 23:45:37 +01:00
ifneq ($(jni_shared_libraries),)
Make manifest and APK agree on uncompressed native libs Only put uncompressed native libs in an APK if the min_sdk_version supports it (>= 23, Marshmallow), and set android:extractNativeLibs="false" in the AndroidManifest.xml so that the platform won't extract them anyways. Bug: 117618214 Test: m checkbuild Change-Id: Iae26e4676c29c68fa3f76187512c82786bfa0522
2019-02-07 01:36:32 +01:00
$(call create-jni-shared-libs-package,$@.parts/jni.zip,$(PRIVATE_USE_EMBEDDED_NATIVE_LIBS))
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-06 23:45:37 +01:00
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-27 19:07:17 +01:00
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call create-java-resources-jar,$@.parts/res.zip))
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-11 19:32:01 +01:00
else # full_classes_jar
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE))
$(call extract-resources-jar,$@.parts/res.zip,$(PRIVATE_SOURCE_ARCHIVE))
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-11 19:32:01 +01:00
endif # full_classes_jar
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(MERGE_ZIPS) $@ $@.parts/*.zip
rm -rf $@.parts
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 12:46:30 +01:00
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
@# No need to align, sign-package below will do it.
$(uncompress-dexs)
endif
Remove support for stripping dex. Stripping is incompatible with ART module updatability. Bug: 65154345 Bug: 138851227 Test: build and observe no change in output (stripping is not used by default). Change-Id: Ic2d9738ef393814c3af3cad116071f7b5938aa84
2019-10-18 15:47:19 +02:00
# Run appcompat before signing.
Do not run veridex on unbundled app builds Unbundled app builds do not build the framework, only apps against the prebuilt public API. Running veridex from the local tree does, however, depend on the framework to generate the list of non-SDK APIs. Disable veridex on such builds and remove appcompat.zip from artifacts. Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I16289adc7fc660109d61260e8a49e992228e727c
2018-07-31 12:31:30 +02:00
ifeq ($(module_run_appcompat),true)
Run appcompat on vendor and product-services. Also add some more relevant information at the beginning of each report, to make triaging of the reports easier. To test this I declared ExactCalculator as LOCAL_PRODUCT_SERVICES_MODULE, and this is the resulting log: """ Package name: com.android.calculator2 Module name in Android tree: ExactCalculator Local path in Android tree: packages/apps/ExactCalculator Install path on aosp_marlin-eng: out/target/product/marlin/system/product-services/app/ExactCalculator/ExactCalculator.apk appcompat.sh output: NOTE: appcompat.sh is still under development. It can report API uses that do not execute at runtime, and reflection uses that do not exist. It can also miss on reflection uses. 1: Reflection light greylist Landroid/os/Bundle;->getIBinder use(s): Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder; 2: Reflection light greylist Landroid/view/View;->mAccessibilityDelegate use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->hasAccessibilityDelegate(Landroid/view/View;)Z 3: Reflection light greylist Landroid/view/View;->mMinHeight use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->getMinimumHeight(Landroid/view/View;)I 4: Reflection light greylist Landroid/view/View;->mMinWidth use(s): Landroid/support/v4/view/ViewCompat$ViewCompatBaseImpl;->getMinimumWidth(Landroid/view/View;)I 4 hidden API(s) used: 0 linked against, 4 through reflection 0 in blacklist 0 in dark greylist 4 in light greylist To run an analysis that can give more reflection accesses, but could include false positives, pass the --imprecise flag. """ Test: m (also on internal) Bug: 110073830 Change-Id: I5114f51d1ab163e954fcffb159ef335abc289cf6
2018-07-31 16:29:13 +02:00
$(appcompat-header)
Run appcompat on all /product modules. The output of the appcompat tool is store on $(PRODUCT_OUT)/appcompat. Bug: 110073830 Bug: 78924201 Test: m Change-Id: Ia77cc53fc241a048958cf243ba298298f800f933
2018-07-13 17:44:28 +02:00
$(run-appcompat)
Do not run veridex on unbundled app builds Unbundled app builds do not build the framework, only apps against the prebuilt public API. Running veridex from the local tree does, however, depend on the framework to generate the list of non-SDK APIs. Disable veridex on such builds and remove appcompat.zip from artifacts. Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I16289adc7fc660109d61260e8a49e992228e727c
2018-07-31 12:31:30 +02:00
endif # module_run_appcompat
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-15 21:09:32 +02: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 13:31:17 +02: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-06 23:45:37 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
my_package_res_pb := $(intermediates)/package-res.pb.apk
$(my_package_res_pb): $(my_res_package) $(AAPT2)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
$(AAPT2) convert --output-format proto $< -o $@
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
$(my_bundle_module): $(my_package_res_pb)
$(my_bundle_module): PRIVATE_RES_PACKAGE := $(my_package_res_pb)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
$(my_bundle_module): $(jni_shared_libraries)
$(my_bundle_module): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)
$(my_bundle_module): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
ifneq ($(full_classes_jar),)
$(my_bundle_module): PRIVATE_DEX_FILE := $(built_dex)
# Use the jarjar processed archive as the initial package file.
$(my_bundle_module): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar)
$(my_bundle_module): $(built_dex)
else
$(my_bundle_module): PRIVATE_DEX_FILE :=
$(my_bundle_module): PRIVATE_SOURCE_ARCHIVE :=
Add dependencies on java resources when packaging APK without classes When an APK is packaged without any classes.dex files the resources are packaged directly, and so the packaging rule must depend on the resources. Fixes: 177295654 Test: prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_cf_x86_64_phone.ninja -t query out/target/product/vsoc_x86_64/obj/APPS/CtsSplitApp_x86_64_intermediates/package.apk Change-Id: I786e71439f11e7bd5e20e010b66fbf529eb57a5a
2021-01-13 00:08:08 +01:00
# We don't build jar, need to add the Java resources here.
$(my_bundle_module): $(java_resource_sources)
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
endif # full_classes_jar
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
$(my_bundle_module): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
@echo "target Bundle: $(PRIVATE_MODULE) ($@)"
rm -rf $@.parts
mkdir -p $@.parts
$(ZIP2ZIP) -i $(PRIVATE_RES_PACKAGE) -o $@.parts/apk.zip AndroidManifest.xml:manifest/AndroidManifest.xml resources.pb "res/**/*" "assets/**/*"
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
ifneq ($(jni_shared_libraries),)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
$(call create-jni-shared-libs-package,$@.parts/jni.zip)
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
endif
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
Only zip2zip bundle resources if they exist Only attempt to zip2zip the bundle parts/res.zip if it was created because of full_classes_jar or PRIVATE_EXTRA_JAR_ARGS. Bug: 117295826 Test: m dist on unbundled target with no resources or classes Change-Id: I6072b29c7331201f33d196c24154f9947b4b0053
2018-11-05 19:13:10 +01:00
$(if $(PRIVATE_EXTRA_JAR_ARGS),\
$(call create-java-resources-jar,$@.parts/res.zip) && \
$(ZIP2ZIP) -i $@.parts/res.zip -o $@.parts/res.zip.tmp "**/*:root/" && \
mv -f $@.parts/res.zip.tmp $@.parts/res.zip)
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
else # full_classes_jar
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
$(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE))
$(ZIP2ZIP) -i $@.parts/dex.zip -o $@.parts/dex.zip.tmp "classes*.dex:dex/"
mv -f $@.parts/dex.zip.tmp $@.parts/dex.zip
$(call extract-resources-jar,$@.parts/res.zip,$(PRIVATE_SOURCE_ARCHIVE))
Only zip2zip bundle resources if they exist Only attempt to zip2zip the bundle parts/res.zip if it was created because of full_classes_jar or PRIVATE_EXTRA_JAR_ARGS. Bug: 117295826 Test: m dist on unbundled target with no resources or classes Change-Id: I6072b29c7331201f33d196c24154f9947b4b0053
2018-11-05 19:13:10 +01:00
$(ZIP2ZIP) -i $@.parts/res.zip -o $@.parts/res.zip.tmp "**/*:root/"
mv -f $@.parts/res.zip.tmp $@.parts/res.zip
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
endif # full_classes_jar
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01:00
$(MERGE_ZIPS) $@ $@.parts/*.zip
rm -rf $@.parts
Access ALL_MODULES subvars with my_register_name ALL_MODULES and subvars are registered with my_register_name. Replace references of ALL_MODULES.$(LOCAL_MODULE).* with ALL_MODULES.$(my_register_name).*. Bug: 155869107 Test: TH presubmit build pass Test: TH presubmit build noop Change-Id: I1481c341a285dc04de86619abec3194bb92c9739
2020-05-08 09:38:46 +02:00
ALL_MODULES.$(my_register_name).BUNDLE := $(my_bundle_module)
Revert "Revert "Create bundle modules suitable for bundletool"" This reverts commit 3451e0ddf28120ac2ecd472a9d235261fa7be6bf. Reason for revert: zip2zip now handles recursive globs better. Bug: 117295826 Change-Id: Ifa30add28d6dbef03d08f8ef7826bb82ed702af6
2018-11-01 21:34:08 +01: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 02:46:56 +01:00
ifdef TARGET_BUILD_APPS
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
ifdef LOCAL_DPI_VARIANTS
$(call pretty-error,Building DPI-specific APKs is no longer supported)
endif
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 02:46:56 +01:00
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 01:13:33 +02:00
###############################
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
## Rule to build a jar containing dex files to dexpreopt without waiting for
## the APK
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 01:13:33 +02:00
ifdef LOCAL_DEX_PREOPT
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
$(my_dex_jar): PRIVATE_DEX_FILE := $(built_dex)
Add missing dependecy on SOONG_ZIP Bug: 130111713 Test: treehugger Change-Id: Ic5b7c4fbefa83cf002c5f30c1b4646f35e718ca2
2019-06-12 08:05:02 +02:00
$(my_dex_jar): $(built_dex) $(SOONG_ZIP)
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-28 22:34:59 +02:00
$(hide) mkdir -p $(dir $@) && rm -f $@
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(call create-dex-jar,$@,$(PRIVATE_DEX_FILE))
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 01:13:33 +02:00
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 00:42:11 +02: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-23 19:27:57 +02: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-04 19:07:41 +01: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-23 19:27:57 +02: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 00:42:11 +02: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 08:38:04 +02: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-23 19:27:57 +02: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 00:42:11 +02: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 01:21:36 +01: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 08:38:04 +02: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-23 19:27:57 +02: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 00:42:11 +02: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 08:38:04 +02: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 00:42:11 +02: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 01:01:28 +02: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-03 21:43:50 +02:00
ifdef LOCAL_COMPATIBILITY_SUITE
Revert "Revert "Build System: Solve dependency problem for test"" This reverts commit 6fe7f194b9ba0375aeee6f0d93f74f95a820084b. Reason for revert: Fixed all build break. Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
2019-03-14 02:04:05 +01:00
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(foreach s,$(my_split_suffixes),\
$(call compat-copy-pair,$(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 03:04:10 +01: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-03 21:43:50 +02: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 00:42:11 +02: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-06 23:45:37 +01:00
# Save information about this package
PACKAGES.$(LOCAL_PACKAGE_NAME).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
PACKAGES.$(LOCAL_PACKAGE_NAME).RESOURCE_FILES := $(all_resources)
Incorrect file names in apkcerts.txt for Make modules This change fixes a regression that was caused by I56bc55e2231eb946617a9d6f97d55c9b61f3bff7 that file names for Make modules are ".apk" in apkcerts.txt. This was because PACKAGES.$(LOCAL_MODULE).STEM was only set for the modules from Soong. It is now set for Make modules too. Bug: 155440232 Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list and check the generated apkcerts txt file to see that it doesn't have an entry where file name is ".apk" Exempt-From-Owner-Approval: cherry-pick from internal Merged-In: I6f14bbb5678255bef2c1f2397f59ede6c2b5df18 (cherry picked from commit db64e3d5286b4ab5e9977f961948a4e9e47203f9) Change-Id: I6f14bbb5678255bef2c1f2397f59ede6c2b5df18
2020-05-03 03:51:14 +02:00
ifneq ($(LOCAL_MODULE_STEM),)
PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
else
PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
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-06 23:45:37 +01:00
PACKAGES := $(PACKAGES) $(LOCAL_PACKAGE_NAME)
# 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 16:44:58 +01:00
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
ifneq (,$(runtime_resource_overlays_product)$(runtime_resource_overlays_vendor))
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 16:44:58 +01:00
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
Put DEVICE/PRODUCT overlays in different partitions This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS to be generated in the vendor partition, as opposed to /product where they were generated in the past. Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages to /product, which means that a single app can be overlayed from different partitions. These RROs have been given module and package names based on their location. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-18 12:43:30 +01:00
ifdef runtime_resource_overlays_product
$(call append_enforce_rro_sources, \
$(my_register_name), \
$(enforce_rro_is_manifest_package_name), \
$(enforce_rro_manifest_package_info), \
$(enforce_rro_use_res_lib), \
$(runtime_resource_overlays_product), \
product \
)
endif
ifdef runtime_resource_overlays_vendor
$(call append_enforce_rro_sources, \
$(my_register_name), \
$(enforce_rro_is_manifest_package_name), \
$(enforce_rro_manifest_package_info), \
$(enforce_rro_use_res_lib), \
$(runtime_resource_overlays_vendor), \
vendor \
)
endif
Refactor and further simplify the RRO logic Make the runtime vs static resource overlays a little clearer. This will help adding more logic around determining if an RRO needs to be generated in /vendor, /product or both. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-14 20:48:17 +01:00
endif
Reference in a new issue Copy permalink