Add WITH_ART support to product definitions
Change-Id: I71f0fad07ebed73f4f69cb8c37eb1c4f88c1a9b0
diff --git a/target/product/core.mk b/target/product/core.mk
index d503ddc..56ee946 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -71,27 +71,8 @@
libwebrtc_audio_preprocessing \
mdnsd \
mms-common \
- okhttp \
requestsync \
telephony-common \
voip-common
-# host-only dependencies
-ifeq ($(WITH_HOST_DALVIK),true)
- PRODUCT_PACKAGES += \
- apache-xml-hostdex \
- bouncycastle-hostdex \
- conscrypt-hostdex \
- core-hostdex \
- okhttp-hostdex \
- libcrypto \
- libexpat \
- libicui18n \
- libicuuc \
- libjavacore \
- libssl \
- libz-host \
- dalvik
-endif
-
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 4f4623c..3dab1a9 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -32,27 +32,11 @@
PackageInstaller \
SettingsProvider \
Shell \
- apache-xml \
- bouncycastle \
bu \
- cacerts \
com.android.location.provider \
com.android.location.provider.xml \
- conscrypt \
- core \
- core-junit \
- dalvikvm \
- dexdeps \
- dexdump \
- dexlist \
- dexopt \
- dmtracedump \
drmserver \
- dx \
- ext \
framework-res \
- hprof-conv \
- icu.dat \
installd \
ip \
ip-up-vpn \
@@ -62,24 +46,16 @@
keystore.default \
libOpenMAXAL \
libOpenSLES \
- libcrypto \
libdownmix \
- libdvm \
libdrmframework \
libdrmframework_jni \
- libexpat \
libfilterfw \
- libicui18n \
- libicuuc \
- libjavacore \
- libnativehelper \
libsqlite_jni \
- libssl \
libwilhelm \
- libz \
make_ext4fs \
screencap \
sensorservice \
uiautomator
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/dalvikvm.mk)
diff --git a/target/product/dalvikvm.mk b/target/product/dalvikvm.mk
new file mode 100644
index 0000000..b7003b9
--- /dev/null
+++ b/target/product/dalvikvm.mk
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Provides a functioning dalvikvm without Android frameworks
+
+ifeq ($(WITH_ART),false)
+ PRODUCT_PACKAGES += \
+ libdvm \
+ dexopt
+else
+ PRODUCT_PACKAGES += \
+ libart \
+ dex2oat
+ PRODUCT_PROPERTY_OVERRIDES += \
+ dalvik.vm.lib=libart.so
+endif
+
+PRODUCT_PACKAGES += \
+ apache-xml \
+ bouncycastle \
+ cacerts \
+ conscrypt \
+ core \
+ core-junit \
+ dalvikvm \
+ dexdeps \
+ dexdump \
+ dexlist \
+ dmtracedump \
+ dx \
+ ext \
+ hprof-conv \
+ icu.dat \
+ libcrypto \
+ libexpat \
+ libicui18n \
+ libicuuc \
+ libjavacore \
+ libnativehelper \
+ libssl \
+ libz \
+ okhttp
+
+# host-only dependencies
+ifeq ($(WITH_HOST_DALVIK),true)
+ PRODUCT_PACKAGES += \
+ apache-xml-hostdex \
+ bouncycastle-hostdex \
+ conscrypt-hostdex \
+ core-hostdex \
+ dalvik \
+ libcrypto-host \
+ libexpat-host \
+ libicui18n-host \
+ libicuuc-host \
+ libjavacore \
+ libssl-host \
+ libz-host \
+ okhttp-hostdex
+endif