Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897fe0e8 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Ulya Trafimovich
Browse files

Split out minimal ART dexpreopt config and use it in mainline builds. 

The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
parent 7604390e

target/board/module_arm/device.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

target/board/module_arm64/device.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

target/board/module_x86/device.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

target/board/module_x86_64/device.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

target/product/base_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -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)