p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "core: Move core.oat bootjar definitions into core/config"" 

am: 1e14bc3b7b

Change-Id: I6d366d325fd951302c492e32248d0f6469999225
This commit is contained in:
Mariano Giardina 2017-06-15 11:09:24 +00:00 committed by android-build-merger
parent 5022a346c7 1e14bc3b7b
commit cc33b6005f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config.mk
View File

@ -800,13 +800,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.
#

7
target/product/core_tiny.mk
View File

@ -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