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 /target/product | |
| parent | 336b06f78c33480eac584d646b1a1c48d132c3b5 (diff) | |
| download | build-0650d1503d89f1563978f6006a2f904da7140027.zip build-0650d1503d89f1563978f6006a2f904da7140027.tar.gz 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 'target/product')
| -rw-r--r-- | target/product/core.mk | 3 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 2 | ||||
| -rw-r--r-- | target/product/embedded.mk | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/target/product/core.mk b/target/product/core.mk index b321efd..3e74697 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -78,3 +78,6 @@ PRODUCT_PACKAGES += \ voip-common $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) + +# Override the PRODUCT_BOOT_JARS set in core_minimal.mk +PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 313aee2..04e05a4 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -57,6 +57,8 @@ PRODUCT_PACKAGES += \ sensorservice \ uiautomator +PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:android.policy:services:apache-xml:webviewchromium + PRODUCT_RUNTIMES := runtime_libdvm_default ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_RUNTIMES += runtime_libart diff --git a/target/product/embedded.mk b/target/product/embedded.mk index 15331a9..a9d28fa 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -27,6 +27,8 @@ PRODUCT_PACKAGES += \ gralloc.default \ gzip \ init \ + init.environ.rc \ + init.rc \ input \ libEGL \ libETC1 \ @@ -72,6 +74,9 @@ PRODUCT_PACKAGES += \ property_contexts \ mac_permissions.xml + PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ system/core/rootdir/init.trace.rc:root/init.trace.rc \ + system/core/rootdir/ueventd.rc:root/ueventd.rc \ + system/core/rootdir/etc/hosts:system/etc/hosts |