c7c4a766f0
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.
This change no longer breaks coverage builds, as module
`jacocoagent` has been removed from `TARGET_CORE_JARS` in CL
https://android-review.googlesource.com/c/platform/build/+/1151464.
This reverts commit 7c39368927.
Test: Device boot test
Test: Check that:
export EMMA_INSTRUMENT=true
&& unset EMMA_INSTRUMENT_STATIC
&& m installclean
&& m systemimage
generates a system image that contains these files:
/system/framework/apex-jacocoagent.vdex
/system/framework/boot-jacocoagent.vdex
/system/framework/jacocoagent.jar
/system/framework/<arch>/apex-jacocoagent.art
/system/framework/<arch>/apex-jacocoagent.oat
/system/framework/<arch>/apex-jacocoagent.vdex
/system/framework/<arch>/boot-jacocoagent.art
/system/framework/<arch>/boot-jacocoagent.oat
/system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
Change-Id: Ifdb2331c5dcb992adbfd6c5a3983d8b9b13d16b2
100 lines
3.2 KiB
Makefile
100 lines
3.2 KiB
Makefile
#
|
|
# Copyright (C) 2013 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.
|
|
#
|
|
|
|
# Provides a functioning ART environment without Android frameworks
|
|
|
|
ifeq ($(TARGET_CORE_JARS),)
|
|
$(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable)
|
|
endif
|
|
|
|
# Additional mixins to the boot classpath.
|
|
PRODUCT_PACKAGES += \
|
|
android.test.base \
|
|
|
|
# Why are we pulling in ext, which is frameworks/base, depending on tagsoup and nist-sip?
|
|
PRODUCT_PACKAGES += \
|
|
ext \
|
|
|
|
# Runtime (Bionic) APEX module.
|
|
PRODUCT_PACKAGES += com.android.runtime
|
|
|
|
# ART APEX module.
|
|
# Note that this package includes the minimal boot classpath JARs (listed in
|
|
# TARGET_CORE_JARS), which should no longer be added directly to
|
|
# PRODUCT_PACKAGES.
|
|
PRODUCT_PACKAGES += com.android.art
|
|
PRODUCT_HOST_PACKAGES += com.android.art
|
|
|
|
# Certificates.
|
|
PRODUCT_PACKAGES += \
|
|
cacerts \
|
|
|
|
PRODUCT_PACKAGES += \
|
|
hiddenapi-package-whitelist.xml \
|
|
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
dalvik.vm.image-dex2oat-Xms=64m \
|
|
dalvik.vm.image-dex2oat-Xmx=64m \
|
|
dalvik.vm.dex2oat-Xms=64m \
|
|
dalvik.vm.dex2oat-Xmx=512m \
|
|
dalvik.vm.usejit=true \
|
|
dalvik.vm.usejitprofiles=true \
|
|
dalvik.vm.dexopt.secondary=true \
|
|
dalvik.vm.appimageformat=lz4
|
|
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
ro.dalvik.vm.native.bridge=0
|
|
|
|
# Different dexopt types for different package update/install times.
|
|
# On eng builds, make "boot" reasons only extract for faster turnaround.
|
|
ifeq (eng,$(TARGET_BUILD_VARIANT))
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
pm.dexopt.first-boot=extract \
|
|
pm.dexopt.boot=extract
|
|
else
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
pm.dexopt.first-boot=quicken \
|
|
pm.dexopt.boot=verify
|
|
endif
|
|
|
|
# The install filter is speed-profile in order to enable the use of
|
|
# profiles from the dex metadata files. Note that if a profile is not provided
|
|
# or if it is empty speed-profile is equivalent to (quicken + empty app image).
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
pm.dexopt.install=speed-profile \
|
|
pm.dexopt.bg-dexopt=speed-profile \
|
|
pm.dexopt.ab-ota=speed-profile \
|
|
pm.dexopt.inactive=verify \
|
|
pm.dexopt.shared=speed
|
|
|
|
# Enable resolution of startup const strings.
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
dalvik.vm.dex2oat-resolve-startup-strings=true
|
|
|
|
# Specify default block size of 512K to enable parallel image decompression.
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
dalvik.vm.dex2oat-max-image-block-size=524288
|
|
|
|
# Enable minidebuginfo generation unless overridden.
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
dalvik.vm.minidebuginfo=true \
|
|
dalvik.vm.dex2oat-minidebuginfo=true
|
|
|
|
# Disable iorapd by default
|
|
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
|
|
ro.iorapd.enable=false
|
|
|
|
PRODUCT_USES_DEFAULT_ART_CONFIG := true
|