diff options
author | Ying Wang <wangying@google.com> | 2014-12-08 14:46:29 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-12-16 10:08:00 -0800 |
commit | d54520a667e3bd5c9f2abe98573a5de83bcf4872 (patch) | |
tree | 6e7bb56baa29d1acb5a60217dc2133b092d8b211 /target/product | |
parent | 91e724d42f921dd35943cdc89e8f4c4362da691a (diff) | |
download | build-d54520a667e3bd5c9f2abe98573a5de83bcf4872.zip build-d54520a667e3bd5c9f2abe98573a5de83bcf4872.tar.gz build-d54520a667e3bd5c9f2abe98573a5de83bcf4872.tar.bz2 |
Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.
Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
Diffstat (limited to 'target/product')
-rw-r--r-- | target/product/core_minimal.mk | 3 | ||||
-rw-r--r-- | target/product/core_tiny.mk | 3 | ||||
-rw-r--r-- | target/product/full_mips64.mk | 2 | ||||
-rwxr-xr-x | target/product/full_x86_64.mk | 2 | ||||
-rw-r--r-- | target/product/runtime_common.mk | 41 | ||||
-rw-r--r-- | target/product/runtime_libart.mk | 34 | ||||
-rw-r--r-- | target/product/runtime_libart_default.mk | 21 | ||||
-rw-r--r-- | target/product/runtime_libdvm.mk | 24 | ||||
-rw-r--r-- | target/product/runtime_libdvm_default.mk | 21 |
9 files changed, 29 insertions, 122 deletions
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 4c08cb0..9c5a13b 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -100,11 +100,10 @@ PRODUCT_SYSTEM_SERVER_JARS := \ ethernet-service \ wifi-service -PRODUCT_RUNTIMES := runtime_libart_default - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.zygote=zygote32 PRODUCT_COPY_FILES += \ system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc +$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index d6dbe98..4f948f1 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -100,8 +100,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \ services \ wifi-service -PRODUCT_RUNTIMES := runtime_libart_default - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.zygote=zygote32 PRODUCT_COPY_FILES += \ @@ -110,6 +108,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.carrier=unknown +$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) diff --git a/target/product/full_mips64.mk b/target/product/full_mips64.mk index 408e81c..e813e41 100644 --- a/target/product/full_mips64.mk +++ b/target/product/full_mips64.mk @@ -23,8 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips64/device.mk) -PRODUCT_RUNTIMES := runtime_libart_default - include $(SRC_TARGET_DIR)/product/emulator.mk # Overrides diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index d9c0c1e..051a86e 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -27,8 +27,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) -PRODUCT_RUNTIMES := runtime_libart_default - include $(SRC_TARGET_DIR)/product/emulator.mk ifdef NET_ETH0_STARTONBOOT diff --git a/target/product/runtime_common.mk b/target/product/runtime_common.mk deleted file mode 100644 index 9ae182a..0000000 --- a/target/product/runtime_common.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# 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. -# - -# Common runtime modules for both Dalvik and ART - -PRODUCT_PACKAGES += \ - apache-xml \ - bouncycastle \ - cacerts \ - conscrypt \ - core-junit \ - dalvikvm \ - dexdeps \ - dexdump \ - dexlist \ - dmtracedump \ - dx \ - ext \ - hprof-conv \ - libcrypto \ - libexpat \ - libicui18n \ - libicuuc \ - libjavacore \ - libnativehelper \ - libssl \ - libz \ - okhttp diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index e4200b3..a35122b 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -17,11 +17,33 @@ # Provides a functioning ART environment without Android frameworks PRODUCT_PACKAGES += \ - core-libart \ - libart \ - dex2oat \ - oatdump \ - patchoat + apache-xml \ + bouncycastle \ + cacerts \ + conscrypt \ + core-junit \ + core-libart \ + dalvikvm \ + dex2oat \ + dexdeps \ + dexdump \ + dexlist \ + dmtracedump \ + dx \ + ext \ + hprof-conv \ + libart \ + libcrypto \ + libexpat \ + libicui18n \ + libicuuc \ + libjavacore \ + libnativehelper \ + libssl \ + libz \ + oatdump \ + okhttp \ + patchoat PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ dalvik.vm.image-dex2oat-Xms=64m \ @@ -29,5 +51,3 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ dalvik.vm.dex2oat-Xms=64m \ dalvik.vm.dex2oat-Xmx=512m \ ro.dalvik.vm.native.bridge=0 \ - -include $(SRC_TARGET_DIR)/product/runtime_common.mk diff --git a/target/product/runtime_libart_default.mk b/target/product/runtime_libart_default.mk deleted file mode 100644 index 2d4c793..0000000 --- a/target/product/runtime_libart_default.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -# Set ART as the default runtime environment - -DALVIK_VM_LIB := libart.so - -include $(SRC_TARGET_DIR)/product/runtime_libart.mk diff --git a/target/product/runtime_libdvm.mk b/target/product/runtime_libdvm.mk deleted file mode 100644 index 638d7d7..0000000 --- a/target/product/runtime_libdvm.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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 Dalvik environment without Android frameworks - -PRODUCT_PACKAGES += \ - core \ - libdvm \ - dexopt - -include $(SRC_TARGET_DIR)/product/runtime_common.mk diff --git a/target/product/runtime_libdvm_default.mk b/target/product/runtime_libdvm_default.mk deleted file mode 100644 index b581ce5..0000000 --- a/target/product/runtime_libdvm_default.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -# Set Dalvik as the default runtime environment - -DALVIK_VM_LIB := libdvm.so - -include $(SRC_TARGET_DIR)/product/runtime_libdvm.mk |