openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "core: Move core.oat bootjar definitions into envsetup.mk"

This commit is contained in:
Treehugger Robot 2017-06-16 02:06:00 +00:00 committed by Gerrit Code Review
parent 8c2c1ed667 9d4639c8c2
commit 6cb7688e85
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/envsetup.mk
View File

@ -190,6 +190,13 @@ _vendor_path_placeholder := ||VENDOR-PATH-PH||
TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)
###########################################
#################################################################
# 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))
#################################################################
# Read the product specs so we can get TARGET_DEVICE and other
# variables that we need in order to locate the output files.
include $(BUILD_SYSTEM)/product_config.mk

11
target/product/core_minimal.mk
View File

@ -88,20 +88,19 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml
ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif
# The order of PRODUCT_BOOT_JARS matters.
PRODUCT_BOOT_JARS := \
core-oj \
core-libart \
conscrypt \
okhttp \
$(TARGET_CORE_JARS) \
legacy-test \
bouncycastle \
ext \
framework \
telephony-common \
voip-common \
ims-common \
apache-xml \
org.apache.http.legacy.boot
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.

11
target/product/core_tiny.mk
View File

@ -83,20 +83,19 @@ PRODUCT_PACKAGES += \
logd \
wifi-service
ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif
# The order matters
PRODUCT_BOOT_JARS := \
core-oj \
core-libart \
conscrypt \
okhttp \
$(TARGET_CORE_JARS) \
legacy-test \
bouncycastle \
ext \
framework \
telephony-common \
voip-common \
ims-common \
apache-xml \
nullwebview \
org.apache.http.legacy.boot

11
target/product/runtime_libart.mk
View File

@ -16,15 +16,14 @@
# Provides a functioning ART environment without Android frameworks
ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable)
endif
# Minimal boot classpath. This should be a subset of PRODUCT_BOOT_JARS, and equivalent to
# TARGET_CORE_JARS.
PRODUCT_PACKAGES += \
apache-xml \
bouncycastle \
core-oj \
core-libart \
conscrypt \
okhttp \
$(TARGET_CORE_JARS)
# Additional mixins to the boot classpath.
PRODUCT_PACKAGES += \