tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Split out minimal ART dexpreopt config and use it in mainline builds." am: c895a8a817 am: 6cd9e2e320

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1551610

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1ce15195c885c168155c2673efbd7a6a6646f80
This commit is contained in:
Treehugger Robot 2021-01-20 11:32:07 +00:00 committed by Automerger Merge Worker
commit 56bf7ca8c9
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/board/module_arm/device.mk
View file

@ -14,5 +14,5 @@
# limitations under the License.
#
$(call inherit-product, build/make/target/product/bootclasspath.mk)
$(call inherit-product, build/make/target/product/default_art_config.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

2
target/board/module_arm64/device.mk
View file

@ -14,6 +14,6 @@
# limitations under the License.
#
$(call inherit-product, build/make/target/product/bootclasspath.mk)
$(call inherit-product, build/make/target/product/default_art_config.mk)
$(call inherit-product, build/make/target/product/core_64_bit.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

2
target/board/module_x86/device.mk
View file

@ -14,5 +14,5 @@
# limitations under the License.
#
$(call inherit-product, build/make/target/product/bootclasspath.mk)
$(call inherit-product, build/make/target/product/default_art_config.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

2
target/board/module_x86_64/device.mk
View file

@ -14,6 +14,6 @@
# limitations under the License.
#
$(call inherit-product, build/make/target/product/bootclasspath.mk)
$(call inherit-product, build/make/target/product/default_art_config.mk)
$(call inherit-product, build/make/target/product/core_64_bit.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

1
target/product/base_system.mk
View file

@ -400,5 +400,4 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
$(call inherit-product, $(SRC_TARGET_DIR)/product/bootclasspath.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)

9
target/product/bootclasspath.mk → target/product/default_art_config.mk
View file

@ -47,3 +47,12 @@ ifneq ($(REMOVE_ATB_FROM_BCP),false)
else
PRODUCT_BOOT_JARS += android.test.base
endif
# Minimal configuration for running dex2oat (default argument values).
# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.
PRODUCT_USES_DEFAULT_ART_CONFIG := true
PRODUCT_SYSTEM_PROPERTIES += \
dalvik.vm.image-dex2oat-Xms=64m \
dalvik.vm.image-dex2oat-Xmx=64m \
dalvik.vm.dex2oat-Xms=64m \
dalvik.vm.dex2oat-Xmx=512m \

8
target/product/runtime_libart.mk
View file

@ -16,6 +16,8 @@
# Provides a functioning ART environment without Android frameworks
$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
# Additional mixins to the boot classpath.
PRODUCT_PACKAGES += \
android.test.base \
@ -41,10 +43,6 @@ PRODUCT_PACKAGES += \
hiddenapi-package-whitelist.xml \
PRODUCT_SYSTEM_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 \
@ -96,5 +94,3 @@ PRODUCT_SYSTEM_PROPERTIES += \
PRODUCT_SYSTEM_PROPERTIES += \
dalvik.vm.minidebuginfo=true \
dalvik.vm.dex2oat-minidebuginfo=true
PRODUCT_USES_DEFAULT_ART_CONFIG := true