From 2f137ee11811cce1f33f2968aa9808c1236b5292 Mon Sep 17 00:00:00 2001 From: Mariano Giardina Date: Thu, 15 Jun 2017 10:01:31 +0000 Subject: [PATCH] Revert "core: Move core.oat bootjar definitions into core/config" This reverts commit 8c50798243bbfcffdaef9f678101c539174e171b. Possible culprit of breakage in git_master sdk_google_aw_x86: FAILED: out/target/product/generic_x86/dex_bootjars/system/framework/x86/boot.art ex2oatd E 06-15 03:56:00 47990 47990 runtime.cc:1761] Failed to return pre-allocated NoClassDefFoundError dex2oatd F 06-15 03:56:00 47990 47990 thread.cc:3591] Check failed: new_exception != nullptr Testing if Treehugger passes with the rollback before submitting https://android-build.googleplex.com/builds/submitted/4101897/sdk_google_aw_x86-sdk/latest/view/logs/build_error.log Change-Id: Iceac31e775eaf3cd5fd9b3d2a17d3af200e35b27 --- core/config.mk | 7 ------- target/product/core_tiny.mk | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/config.mk b/core/config.mk index 32fcf44a5..5ff582a13 100644 --- a/core/config.mk +++ b/core/config.mk @@ -799,13 +799,6 @@ else SUPPORT_LIBRARY_ROOT := frameworks/support endif -################################################################# -# Set up minimal BOOTCLASSPATH list of jars to build/execute -# java code with dalvikvm/art. -################################################################# -TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml -HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS)) - # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N. # The 'current' version is whatever this source tree is. # diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index cea6bce1a..2fb450dde 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -85,13 +85,18 @@ PRODUCT_PACKAGES += \ # The order matters PRODUCT_BOOT_JARS := \ - $(TARGET_CORE_JARS) \ + core-oj \ + core-libart \ + conscrypt \ + okhttp \ legacy-test \ + bouncycastle \ ext \ framework \ telephony-common \ voip-common \ ims-common \ + apache-xml \ nullwebview \ org.apache.http.legacy.boot