diff options
author | Brian Carlstrom <bdc@google.com> | 2014-05-29 19:39:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 19:39:49 +0000 |
commit | 8bcf4b7a6380b26c2b42dae00dd8443de2a8e12c (patch) | |
tree | 7306be17d287715ffe04d6459fa36e91a148bb74 | |
parent | 0efea4456e5f881bb549fdacb7f4a4ec7a186676 (diff) | |
parent | 9eae76696fd2eba9eac4283343236a414792c7c0 (diff) | |
download | device_generic_armv7-a-neon-8bcf4b7a6380b26c2b42dae00dd8443de2a8e12c.tar.gz device_generic_armv7-a-neon-8bcf4b7a6380b26c2b42dae00dd8443de2a8e12c.tar.bz2 device_generic_armv7-a-neon-8bcf4b7a6380b26c2b42dae00dd8443de2a8e12c.zip |
am 9eae7669: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"android-l-preview_r2l-preview
* commit '9eae76696fd2eba9eac4283343236a414792c7c0':
Remove dependencies on runtime_libdvm and libdvm.so in general
-rw-r--r-- | mini_common.mk | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/mini_common.mk b/mini_common.mk index 5f7d033..7609396 100644 --- a/mini_common.mk +++ b/mini_common.mk @@ -37,45 +37,20 @@ PRODUCT_PACKAGES += \ TeleService \ TestingCamera \ WAPPushManager \ - apache-xml \ audio \ audio_policy.default \ audio.primary.default \ - bouncycastle \ - cacerts \ com.android.future.usb.accessory \ - conscrypt \ - core \ - core-junit \ - dalvikvm \ - dexdeps \ - dexdump \ - dexlist \ - dexopt \ - dmtracedump \ - dx \ - ext \ hostapd \ - hprof-conv \ - libcrypto \ - libdvm \ - libexpat \ - libicui18n \ - libicuuc \ - libjavacore \ - libnativehelper \ librs_jni \ - libssl \ libvideoeditor_core \ libvideoeditor_jni \ libvideoeditor_osal \ libvideoeditorplayer \ libvideoeditor_videofilters \ - libz \ lint \ local_time.default \ network \ - okhttp \ pand \ power.default \ sdptool \ @@ -86,6 +61,8 @@ PRODUCT_PACKAGES += \ # be included in platform.zip PRODUCT_PACKAGES += camera.goldfish.jpeg +PRODUCT_RUNTIMES := runtime_libart_default + PRODUCT_COPY_FILES += \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ |