diff options
| author | Ying Wang <wangying@google.com> | 2013-07-23 17:57:38 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-07-24 15:15:55 -0700 |
| commit | 0650d1503d89f1563978f6006a2f904da7140027 (patch) | |
| tree | 31730f7410e0017670c497ae0b672fb627c0c8d6 /core | |
| parent | 336b06f78c33480eac584d646b1a1c48d132c3b5 (diff) | |
| download | replicant_build-0650d1503d89f1563978f6006a2f904da7140027.zip replicant_build-0650d1503d89f1563978f6006a2f904da7140027.tar.gz replicant_build-0650d1503d89f1563978f6006a2f904da7140027.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt.mk | 4 | ||||
| -rw-r--r-- | core/legacy_prebuilts.mk | 9 | ||||
| -rw-r--r-- | core/product.mk | 4 | ||||
| -rw-r--r-- | core/product_config.mk | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index ce27763..77b239b 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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 diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk index f767644..c477900 100644 --- a/core/legacy_prebuilts.mk +++ b/core/legacy_prebuilts.mk @@ -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 diff --git a/core/product.mk b/core/product.mk index 89bce1d..35b5b84 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 \ diff --git a/core/product_config.mk b/core/product_config.mk index db52f7a..e4b68cf 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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) |