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

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

Browse source
This commit is contained in:
Igor Murashkin 2017-06-15 03:06:09 +00:00 committed by Gerrit Code Review
commit 5e1aa20225
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/config.mk
View file

@ -799,6 +799,13 @@ else
SUPPORT_LIBRARY_ROOT := frameworks/support SUPPORT_LIBRARY_ROOT := frameworks/support
endif 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. # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
# The 'current' version is whatever this source tree is. # The 'current' version is whatever this source tree is.
# #

7
target/product/core_tiny.mk
View file

@ -85,18 +85,13 @@ PRODUCT_PACKAGES += \
# The order matters # The order matters
PRODUCT_BOOT_JARS := \ PRODUCT_BOOT_JARS := \
core-oj \ $(TARGET_CORE_JARS) \
core-libart \
conscrypt \
okhttp \
legacy-test \ legacy-test \
bouncycastle \
ext \ ext \
framework \ framework \
telephony-common \ telephony-common \
voip-common \ voip-common \
ims-common \ ims-common \
apache-xml \
nullwebview \ nullwebview \
org.apache.http.legacy.boot org.apache.http.legacy.boot