pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
android_build/core/soong_app_prebuilt.mk

203 lines
6.9 KiB
Makefile
Raw Normal View History

Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
# App prebuilt coming from Soong.
# Extra inputs:
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 05:26:33 +00:00
# LOCAL_SOONG_BUILT_INSTALLED
# LOCAL_SOONG_BUNDLE
# LOCAL_SOONG_CLASSES_JAR
# LOCAL_SOONG_DEX_JAR
# LOCAL_SOONG_HEADER_JAR
# LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
# LOCAL_SOONG_PROGUARD_DICT
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
# LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
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 05:26:33 +00:00
# LOCAL_SOONG_RRO_DIRS
# LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
# LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH)
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_app_prebuilt.mk may only be used from Soong)
endif
LOCAL_MODULE_SUFFIX := .apk
LOCAL_BUILT_MODULE_STEM := package.apk
Build aar files for m <module name> Test: m SystemUI-core Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
2019-01-29 23:07:46 +00:00
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
Export app implementation and header jars Also fix a missing dependency on the jacoco-report-classes.jar Test: m checkbuild Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
2017-12-14 21:19:46 +00:00
full_classes_jar := $(intermediates.COMMON)/classes.jar
full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
Build aar files for m <module name> Test: m SystemUI-core Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
2019-01-29 23:07:46 +00:00
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00:00
ifdef LOCAL_SOONG_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))
ifneq ($(TURBINE_ENABLED),false)
ifdef LOCAL_SOONG_HEADER_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
else
$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
endif
endif # TURBINE_ENABLED != false
Add Soong android_app and android_test modules to javac-check android_app and android_test modules were not built as part of javac-check, which resulted in not running them in the Error Prone build. Fixes: 146455923 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I278d7ee0cdc3f49aa8fa4d4f13309e29d700f2ba
2019-12-31 06:08:07 +00:00
javac-check : $(full_classes_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
.PHONY: javac-check-$(LOCAL_MODULE)
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00:00
endif
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 06:58:13 +00:00
# Run veridex on product, system_ext and vendor modules.
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00: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 06:09:09 +00:00
ifeq (true,$(non_system_module))
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00:00
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! 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 17:30:51 +00:00
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00: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 17:30:51 +00:00
endif
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00:00
ifeq ($(module_run_appcompat),true)
$(LOCAL_BUILT_MODULE): $(appcompat-files)
$(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
$(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)
@echo "Copy: $@"
$(copy-file-to-target)
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 06:21:24 +00:00
$(appcompat-header)
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-14 22:10:20 +00:00
$(run-appcompat)
else
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
endif
Export app implementation and header jars Also fix a missing dependency on the jacoco-report-classes.jar Test: m checkbuild Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
2017-12-14 21:19:46 +00:00
Fix dependency on Soong jacoco report classes The dependency on the Soong jacoco report classes was mistakenly using $(common_javalib.jar) which was never set, so was using the value from the last module. Use $(LOCAL_BUILT_MODULE) instead. Test: m checkbuild Change-Id: If502d67f9e5e0c107de44e96cbf232406c027e44
2018-01-02 21:16:43 +00:00
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
$(intermediates.COMMON)/jacoco-report-classes.jar))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(intermediates.COMMON)/jacoco-report-classes.jar)
endif
Add R8 support to Soong. Move R8_COMPAT_PROGUARD definition to Soong. Copy the proguard_dictionary file so that the find command that builds proguard_dict.zip can find it. Test: m checkbuild Change-Id: I28b2fce26ccb6225be0bd71802a43fe63df85daa
2017-12-28 03:46:02 +00:00
ifdef LOCAL_SOONG_PROGUARD_DICT
$(eval $(call copy-one-file,$(LOCAL_SOONG_PROGUARD_DICT),\
$(intermediates.COMMON)/proguard_dictionary))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(intermediates.COMMON)/proguard_dictionary)
endif
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
resource_export_package := $(intermediates.COMMON)/package-export.apk
resource_export_stamp := $(intermediates.COMMON)/src/R.stamp
$(resource_export_package): PRIVATE_STAMP := $(resource_export_stamp)
$(resource_export_package): .KATI_IMPLICIT_OUTPUTS := $(resource_export_stamp)
$(resource_export_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
Remove extra $ in soong_app_prebuilt Change-Id: Ia21d8f7fb3fd5f9e3b8e764d42ebbc61be4226f7
2019-02-06 16:27:47 +00:00
@echo "Copy: $@"
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
$(copy-file-to-target)
touch $(PRIVATE_STAMP)
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 01:21:36 +00:00
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(resource_export_package))
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
java-dex: $(LOCAL_SOONG_DEX_JAR)
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 05:26:33 +00:00
my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\
$(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))
my_installed := $(call copy-many-files, $(my_built_installed))
ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)
Build soong odex files for mma Add the LOCAL_SOONG_BUILD_INSTALLED files as dependencies of $(my_all_targets) instead of $(my_register_name) so they are built for mma and mmma as well as m <module name>. Fixes: 123262430 Test: mmma packages/apps/Gallery2 Change-Id: I0d55beccf9385144c190ea4bf099fb267ac6db1c
2019-01-30 00:26:36 +00:00
$(my_all_targets): $(my_installed)
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
Copy additional test apk outputs to suite dirs. Bug: 143902486 Test: m CtsIsolatedSplitApp Change-Id: I13900ac2c8bb886987362dd380818ab5df2f23c6
2019-11-21 18:09:00 +00:00
# Copy test suite files.
ifdef LOCAL_COMPATIBILITY_SUITE
my_apks_to_install := $(foreach f,$(filter %.apk,$(LOCAL_SOONG_BUILT_INSTALLED)),$(call word-colon,1,$(f)))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(foreach a,$(my_apks_to_install),\
$(call compat-copy-pair,$(a),$(dir)/$(notdir $(a)))))))
$(call create-suite-dependencies)
endif
Add support for JNI libraries to soong_app_prebuilt.mk Use install_jni_libs_internal.mk to install JNI libraries alongside preinstalled APKs. APKs with embedded JNI libraries are handled within Soong. Bug: 80095087 Test: m checkbuild Change-Id: I2ecf10b6771dff14c940cc6e6442eb2ae43a75b0
2018-10-03 21:09:18 +00:00
# embedded JNI will already have been handled by soong
my_embed_jni :=
my_prebuilt_jni_libs :=
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
my_2nd_arch_prefix :=
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH))
include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif
ifdef TARGET_2ND_ARCH
ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH)
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH))
include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
endif
endif
LOCAL_SHARED_JNI_LIBRARIES :=
my_embed_jni :=
my_prebuilt_jni_libs :=
my_2nd_arch_prefix :=
Fix preopting Soong apps dex_preopt_odex_install.mk should always be included, it handles setting a default value for LOCAL_DEX_PREOPT. Use dexpreopt-copy-jar when preopting to strip the dex file if necessary. Bug: 115967961 Test: m SystemUI Change-Id: I74f77ed0e88a67043836407261f3845a16cbaf37
2018-09-18 17:16:37 +00:00
Add Soong modules to apkcerts Bug: 70669383 Test: m apkcerts-list contains framework-res Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 19:20:27 +00:00
PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
Support PRESIGNED in soong_app_prebuilt.mk app_import support in Soong will require support for PRESIGNED. Test: not yet Change-Id: I436e41358b6a1ee2895ecaa9769e96cbf0714a2f
2019-03-21 22:46:25 +00:00
ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
# The magic string "PRESIGNED" means this package is already checked
# signed with its release key.
#
# By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be
# mentioned in apkcerts.txt (with certificate set to "PRESIGNED")
# but the dexpreopt process will not try to re-sign the app.
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED
else ifneq ($(LOCAL_CERTIFICATE),)
Fix swapped certificate and private key in soong apps The .x509.pem file should be in CERTIFICATE, and the .pk8 file in PRIVATE_KEY. Bug: 70669383 Test: examine apkcerts.txt Change-Id: I480f19be2efbbd72ea23ebd681f312b94accfd7a
2017-12-15 21:20:27 +00:00
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE)
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
Add Soong modules to apkcerts Bug: 70669383 Test: m apkcerts-list contains framework-res Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 19:20:27 +00:00
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 05:45:15 +00:00
include $(BUILD_SYSTEM)/app_certificate_validate.mk
Adding overrides support to android_app bps Test: build Change-Id: I7910d042c6e7f8ac9c77e294aca11b01713d0fef
2018-08-10 17:28:00 +00:00
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
Dist bundle modules from Soong Dist bundle modules when requested by TARGET_BUILD_APPS. Bug: 117295826 Test: tapas RecoveryLocalizer && m dist Change-Id: Iad63ceafc2a60e6735b50eca65cc4859f9d71b52
2018-10-30 06:16:42 +00:00
ifdef LOCAL_SOONG_BUNDLE
ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(LOCAL_SOONG_BUNDLE)
endif
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system
else ifneq ($(LOCAL_SDK_VERSION),)
my_link_type := java:sdk
else
my_link_type := java:platform
endif
Remove unnecessary link-type check Modules from Soong do not have dependency specified (via LOCAL_JAVA_LIBRARIES). So, link-type check 'from' them doesn't make sense. Resetting my_warn_types and my_allowed_types Bug: 69899800 Test: m -j checkbuild on aosp_walleye, aosp_sailfish Test: build/soong/build_test.bash --dist Change-Id: I2a409e64f388bd8cb9336be589bf6af33e48a6f4
2018-03-08 06:16:12 +00:00
# warn/allowed types are both empty because Soong modules can't depend on
# make-defined modules.
my_warn_types :=
my_allowed_types :=
Add support for app prebuilts from soong Allow soong to pass a built app to Make as a prebuilt .apk. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-16 05:35:27 +00:00
my_link_deps :=
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE
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 11:43:30 +00:00
ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
Add support for RRO in soong app prebuilts Let soong pass overlay directories that were not used because of enforced RROs and use the make rules to convert them to the auto generated RRO package. Bug: 69917341 Test: m checkbuild Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
2017-12-01 04:11:22 +00:00
$(call append_enforce_rro_sources, \
$(my_register_name), \
false, \
$(LOCAL_FULL_MANIFEST_FILE), \
Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset If LOCAL_EXPORT_PACKAGE_RESOURCES is unset then append_enforce_rro_sources was inserting a blank entry into the 4th. When converting the || separator back to space that resulted in a two sequential spaces, which is treated as a single word separator, causing the 5th field to be treated as the 4th field. Put "false" into the 4th field in soong_app_prebuilt.mk to match package_internal.mk. Bug: 123510624 Test: m SystemUIGoogle Change-Id: I794c413e33df2020d0dc43379cfb017e7e09baa1
2019-01-28 20:56:17 +00:00
$(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \
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 11:43:30 +00:00
$(LOCAL_SOONG_DEVICE_RRO_DIRS), \
vendor \
)
endif
ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
$(call append_enforce_rro_sources, \
$(my_register_name), \
false, \
$(LOCAL_FULL_MANIFEST_FILE), \
$(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \
$(LOCAL_SOONG_PRODUCT_RRO_DIRS), \
product \
)
Add support for RRO in soong app prebuilts Let soong pass overlay directories that were not used because of enforced RROs and use the make rules to convert them to the auto generated RRO package. Bug: 69917341 Test: m checkbuild Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
2017-12-01 04:11:22 +00:00
endif
Fix java soong_to_convert data soong_to_convert looks for modules with no unconverted deps, but the list of converted modules was not being updated for java and app prebuilts. That meant soong_to_convert only reported modules with no deps at all. Test: examine soong_to_convert.txt Change-Id: I136e6fa74153a80df5ecd767642bb2feb2ddb9dc
2018-08-17 05:55:43 +00:00
SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)