Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0650d150 authored by Ying Wang's avatar Ying Wang
Browse files

Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH 

- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
parent 336b06f7

core/dex_preopt.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
#

####################################



# TODO: replace it with device's BOOTCLASSPATH

DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium

DEXPREOPT_BOOT_JARS := $(PRODUCT_BOOT_JARS)

DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar))



DEXPREOPT_BUILD_DIR := $(OUT_DIR)

DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(PRODUCT_OUT))/dex_bootjars

core/legacy_prebuilts.mk

+0 −9
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ GRANDFATHERED_ALL_PREBUILT := \ 
	cdt.bin \

	chat-ril \

	cpcap-key.kl \

	data \

	dev \

	egl.cfg \

	firmware_error.565 \

	firmware_install.565 \
@@ -45,13 +43,11 @@ GRANDFATHERED_ALL_PREBUILT := \ 
	gps.stingray.so \

	gralloc.omap3.so \

	gralloc.tegra.so \

	hosts \

	hwcomposer.tegra.so \

	ime \

	init.goldfish.rc \

	init.goldfish.sh \

	init.olympus.rc \

	init.rc \

	init.sholes.rc \

	init.stingray.rc \

	input \
@@ -76,23 +72,18 @@ GRANDFATHERED_ALL_PREBUILT := \ 
	pm \

	pppd-ril \

	pppd-ril.options \

	proc \

	qwerty.kl \

	radio.img \

	rdl.bin \

	RFFspeed_501.bmd \

	RFFstd_501.bmd \

	savebpver \

	sbin \

	sholes-keypad.kl \

	suplcerts.bks \

	svc \

	sys \

	system \

	tcmd \

	ueventd.goldfish.rc \

	ueventd.olympus.rc \

	ueventd.rc \

	ueventd.stingray.rc \

	vold.fstab \

	wl1271.bin

core/product.mk

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ _product_var_list := \ 
    PRODUCT_VENDOR_KERNEL_HEADERS \

    PRODUCT_FACTORY_RAMDISK_MODULES \

    PRODUCT_FACTORY_BUNDLE_MODULES \

    PRODUCT_RUNTIMES

    PRODUCT_RUNTIMES \

    PRODUCT_BOOT_JARS





define dump-product
@@ -208,6 +209,7 @@ endef 




_product_stash_var_list := $(_product_var_list) \

	PRODUCT_BOOTCLASSPATH \

	TARGET_ARCH \

	TARGET_ARCH_VARIANT \

	TARGET_CPU_VARIANT \

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -268,6 +268,9 @@ PRODUCT_RUNTIMES := $(product_runtimes) 
product_runtimes :=

#############################################################################



# A list of module names of BOOTCLASSPATH (jar files)

PRODUCT_BOOT_JARS := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS)



# Find the device that this product maps to.

TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)

target/board/vbox_x86/BoardConfig.mk

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ TARGET_NO_RECOVERY := true 
TARGET_HARDWARE_3D := false

BOARD_USES_GENERIC_AUDIO := true

USE_CAMERA_STUB := true

TARGET_PROVIDES_INIT_RC := true

TARGET_CPU_ABI := x86

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_BOOTIMAGE_USE_EXT2 := true