Merge "core: Move core.oat bootjar definitions into envsetup.mk"
This commit is contained in:
@@ -190,6 +190,13 @@ _vendor_path_placeholder := ||VENDOR-PATH-PH||
|
|||||||
TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)
|
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
|
# Read the product specs so we can get TARGET_DEVICE and other
|
||||||
# variables that we need in order to locate the output files.
|
# variables that we need in order to locate the output files.
|
||||||
include $(BUILD_SYSTEM)/product_config.mk
|
include $(BUILD_SYSTEM)/product_config.mk
|
||||||
|
@@ -88,20 +88,19 @@ PRODUCT_PACKAGES += \
|
|||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml
|
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.
|
# The order of PRODUCT_BOOT_JARS 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 \
|
|
||||||
org.apache.http.legacy.boot
|
org.apache.http.legacy.boot
|
||||||
|
|
||||||
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
|
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
|
||||||
|
@@ -83,20 +83,19 @@ PRODUCT_PACKAGES += \
|
|||||||
logd \
|
logd \
|
||||||
wifi-service
|
wifi-service
|
||||||
|
|
||||||
|
ifeq ($(TARGET_CORE_JARS),)
|
||||||
|
$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
|
||||||
|
endif
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
|
@@ -16,15 +16,14 @@
|
|||||||
|
|
||||||
# Provides a functioning ART environment without Android frameworks
|
# 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
|
# Minimal boot classpath. This should be a subset of PRODUCT_BOOT_JARS, and equivalent to
|
||||||
# TARGET_CORE_JARS.
|
# TARGET_CORE_JARS.
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
apache-xml \
|
$(TARGET_CORE_JARS)
|
||||||
bouncycastle \
|
|
||||||
core-oj \
|
|
||||||
core-libart \
|
|
||||||
conscrypt \
|
|
||||||
okhttp \
|
|
||||||
|
|
||||||
# Additional mixins to the boot classpath.
|
# Additional mixins to the boot classpath.
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
Reference in New Issue
Block a user