diff options
28 files changed, 90 insertions, 98 deletions
diff --git a/armv8/vendorsetup.sh b/BoardConfigCommon.mk index 2af5b76..f2dfec8 100644 --- a/armv8/vendorsetup.sh +++ b/BoardConfigCommon.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 The Android Open Source Project +# Copyright (C) 2019 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. @@ -14,4 +14,13 @@ # limitations under the License. # -add_lunch_combo armv8-eng +# Configuration elements common to all ART generic device BoardConfig.mk files. + +TARGET_NO_BOOTLOADER := true +TARGET_NO_KERNEL := true + +TARGET_CPU_SMP := true + +# Flatten APEX packages to make them simpler to use in +# ART testing/benchmarking environments. +TARGET_FLATTEN_APEX := true diff --git a/arm_krait/AndroidProducts.mk b/arm_krait/AndroidProducts.mk index e0d5f1f..91934dd 100644 --- a/arm_krait/AndroidProducts.mk +++ b/arm_krait/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/arm_krait.mk + +COMMON_LUNCH_CHOICES := \ + arm_krait-eng diff --git a/arm_krait/BoardConfig.mk b/arm_krait/BoardConfig.mk index 7eceba5..9fed729 100644 --- a/arm_krait/BoardConfig.mk +++ b/arm_krait/BoardConfig.mk @@ -14,14 +14,12 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := arm TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := krait TARGET_ARCH_VARIANT := armv7-a-neon -USE_CLANG_PLATFORM_BUILD := true diff --git a/arm_krait/arm_krait.mk b/arm_krait/arm_krait.mk index 918d192..7442f34 100644 --- a/arm_krait/arm_krait.mk +++ b/arm_krait/arm_krait.mk @@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += \ art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := arm_krait PRODUCT_DEVICE := arm_krait diff --git a/arm_v7_v8/AndroidProducts.mk b/arm_v7_v8/AndroidProducts.mk index 931c274..7d6a244 100644 --- a/arm_v7_v8/AndroidProducts.mk +++ b/arm_v7_v8/AndroidProducts.mk @@ -19,3 +19,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/arm_v7_v8.mk + +COMMON_LUNCH_CHOICES := \ + arm_v7_v8-eng diff --git a/arm_v7_v8/BoardConfig.mk b/arm_v7_v8/BoardConfig.mk index b26b032..b252033 100644 --- a/arm_v7_v8/BoardConfig.mk +++ b/arm_v7_v8/BoardConfig.mk @@ -14,12 +14,11 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := arm64 TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := generic TARGET_ARCH_VARIANT := armv8-a @@ -32,9 +31,6 @@ TARGET_2ND_CPU_ABI2 := armeabi TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_64_BIT_APPS := true -USE_CLANG_PLATFORM_BUILD := true -# Disable debug binaries and dexpreopt for -# an unbundled ART build. -PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false +# Disable dexpreopt for an unbundled ART build. WITH_DEXPREOPT := false diff --git a/arm_v7_v8/arm_v7_v8.mk b/arm_v7_v8/arm_v7_v8.mk index 8c1d293..b8e803d 100644 --- a/arm_v7_v8/arm_v7_v8.mk +++ b/arm_v7_v8/arm_v7_v8.mk @@ -14,9 +14,12 @@ # limitations under the License. # -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := arm_v7_v8 PRODUCT_DEVICE := arm_v7_v8 PRODUCT_BRAND := Android PRODUCT_MODEL := ARM v7 and v8 + +# Disable debug binaries for an unbundled ART build. +PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false diff --git a/armv8/AndroidProducts.mk b/armv8/AndroidProducts.mk index b81a141..a2327e4 100644 --- a/armv8/AndroidProducts.mk +++ b/armv8/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/armv8.mk + +COMMON_LUNCH_CHOICES := \ + armv8-eng diff --git a/armv8/BoardConfig.mk b/armv8/BoardConfig.mk index e50c642..1375c33 100644 --- a/armv8/BoardConfig.mk +++ b/armv8/BoardConfig.mk @@ -14,12 +14,11 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := arm64 TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := generic TARGET_ARCH_VARIANT := armv8-a @@ -27,4 +26,3 @@ TARGET_PREFER_32_BIT_APPS := TARGET_SUPPORTS_32_BIT_APPS := TARGET_SUPPORTS_64_BIT_APPS := true -USE_CLANG_PLATFORM_BUILD := true diff --git a/armv8/armv8.mk b/armv8/armv8.mk index bd5ce92..7daf985 100644 --- a/armv8/armv8.mk +++ b/armv8/armv8.mk @@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += \ art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := armv8 PRODUCT_DEVICE := armv8 diff --git a/arm_krait/vendorsetup.sh b/armv8_kryo385/AndroidProducts.mk index 2fb9b11..1cfc959 100644 --- a/arm_krait/vendorsetup.sh +++ b/armv8_kryo385/AndroidProducts.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 The Android Open Source Project +# Copyright (C) 2018 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. @@ -14,4 +14,8 @@ # limitations under the License. # -add_lunch_combo arm_krait-eng +PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/armv8_kryo385.mk + +COMMON_LUNCH_CHOICES := \ + armv8_kryo385-eng diff --git a/arm_v7_v8/vendorsetup.sh b/armv8_kryo385/BoardConfig.mk index 6b0fcf0..967dc29 100644 --- a/arm_v7_v8/vendorsetup.sh +++ b/armv8_kryo385/BoardConfig.mk @@ -1,5 +1,5 @@ -# -# Copyright (C) 2017 The Android Open Source Project + +# Copyright (C) 2018 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. @@ -14,4 +14,15 @@ # limitations under the License. # -add_lunch_combo arm_v7_v8-eng +include device/generic/art/BoardConfigCommon.mk + +TARGET_ARCH := arm64 + +TARGET_CPU_ABI := arm64-v8a +TARGET_CPU_VARIANT := kryo385 +TARGET_ARCH_VARIANT := armv8-2a + +TARGET_PREFER_32_BIT_APPS := +TARGET_SUPPORTS_32_BIT_APPS := +TARGET_SUPPORTS_64_BIT_APPS := true + diff --git a/mips32r2_fp/vendorsetup.sh b/armv8_kryo385/armv8_kryo385.mk index cff24f0..c926dc6 100644 --- a/mips32r2_fp/vendorsetup.sh +++ b/armv8_kryo385/armv8_kryo385.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 The Android Open Source Project +# Copyright (C) 2018 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. @@ -14,4 +14,15 @@ # limitations under the License. # -add_lunch_combo mips32r2_fp-eng +PRODUCT_COPY_FILES += \ + art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt + +$(call inherit-product, build/target/product/core_minimal.mk) + +PRODUCT_NAME := armv8_kryo385 +PRODUCT_DEVICE := armv8_kryo385 +PRODUCT_BRAND := Android +PRODUCT_MODEL := Qualcomm Kryo385 + +# Force 64bits executables. +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64 diff --git a/mips32r2_fp/AndroidProducts.mk b/mips32r2_fp/AndroidProducts.mk index 2e921b6..4e24746 100644 --- a/mips32r2_fp/AndroidProducts.mk +++ b/mips32r2_fp/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mips32r2_fp.mk + +COMMON_LUNCH_CHOICES := \ + mips32r2_fp-eng diff --git a/mips32r2_fp/BoardConfig.mk b/mips32r2_fp/BoardConfig.mk index 48e9491..a364cbf 100644 --- a/mips32r2_fp/BoardConfig.mk +++ b/mips32r2_fp/BoardConfig.mk @@ -14,13 +14,11 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := mips TARGET_CPU_ABI := mips -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := generic TARGET_ARCH_VARIANT := mips32r2-fp -USE_CLANG_PLATFORM_BUILD := true diff --git a/mips32r2_fp/mips32r2_fp.mk b/mips32r2_fp/mips32r2_fp.mk index 2372b6e..52705ae 100644 --- a/mips32r2_fp/mips32r2_fp.mk +++ b/mips32r2_fp/mips32r2_fp.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := mips32r2_fp PRODUCT_DEVICE := mips32r2_fp diff --git a/mips32r2_fp_xburst/AndroidProducts.mk b/mips32r2_fp_xburst/AndroidProducts.mk index 3e33015..7268242 100644 --- a/mips32r2_fp_xburst/AndroidProducts.mk +++ b/mips32r2_fp_xburst/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mips32r2_fp_xburst.mk + +COMMON_LUNCH_CHOICES := \ + mips32r2_fp_xburst-eng diff --git a/mips32r2_fp_xburst/BoardConfig.mk b/mips32r2_fp_xburst/BoardConfig.mk index d557cda..3802ffa 100644 --- a/mips32r2_fp_xburst/BoardConfig.mk +++ b/mips32r2_fp_xburst/BoardConfig.mk @@ -14,13 +14,11 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := mips TARGET_CPU_ABI := mips -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := TARGET_ARCH_VARIANT := mips32r2-fp-xburst -USE_CLANG_PLATFORM_BUILD := true diff --git a/mips32r2_fp_xburst/mips32r2_fp_xburst.mk b/mips32r2_fp_xburst/mips32r2_fp_xburst.mk index 68c16c3..6aea5ae 100644 --- a/mips32r2_fp_xburst/mips32r2_fp_xburst.mk +++ b/mips32r2_fp_xburst/mips32r2_fp_xburst.mk @@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += \ art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := mips32r2_fp_xburst PRODUCT_DEVICE := mips32r2_fp_xburst diff --git a/mips32r2_fp_xburst/vendorsetup.sh b/mips32r2_fp_xburst/vendorsetup.sh deleted file mode 100644 index 77a0603..0000000 --- a/mips32r2_fp_xburst/vendorsetup.sh +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2016 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. -# - -add_lunch_combo mips32r2_fp_xburst-eng diff --git a/mips64r6/AndroidProducts.mk b/mips64r6/AndroidProducts.mk index 5ed5209..b08feef 100644 --- a/mips64r6/AndroidProducts.mk +++ b/mips64r6/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mips64r6.mk + +COMMON_LUNCH_CHOICES := \ + mips64r6-eng diff --git a/mips64r6/BoardConfig.mk b/mips64r6/BoardConfig.mk index 47eb1d8..76ea5c8 100644 --- a/mips64r6/BoardConfig.mk +++ b/mips64r6/BoardConfig.mk @@ -14,12 +14,11 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := mips64 TARGET_CPU_ABI := mips64 -TARGET_CPU_SMP := true TARGET_CPU_VARIANT := generic TARGET_ARCH_VARIANT := mips64r6 @@ -27,4 +26,3 @@ TARGET_PREFER_32_BIT_APPS := TARGET_SUPPORTS_32_BIT_APPS := TARGET_SUPPORTS_64_BIT_APPS := true -USE_CLANG_PLATFORM_BUILD := true diff --git a/mips64r6/mips64r6.mk b/mips64r6/mips64r6.mk index 87c645c..87a6d23 100644 --- a/mips64r6/mips64r6.mk +++ b/mips64r6/mips64r6.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := mips64r6 PRODUCT_DEVICE := mips64r6 diff --git a/mips64r6/vendorsetup.sh b/mips64r6/vendorsetup.sh deleted file mode 100644 index c561988..0000000 --- a/mips64r6/vendorsetup.sh +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2015 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. -# - -add_lunch_combo mips64r6-eng diff --git a/silvermont/AndroidProducts.mk b/silvermont/AndroidProducts.mk index 1426194..9fa0864 100644 --- a/silvermont/AndroidProducts.mk +++ b/silvermont/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/silvermont.mk \ + +COMMON_LUNCH_CHOICES := \ + silvermont-eng diff --git a/silvermont/BoardConfig.mk b/silvermont/BoardConfig.mk index 572ce89..1d70372 100644 --- a/silvermont/BoardConfig.mk +++ b/silvermont/BoardConfig.mk @@ -14,12 +14,10 @@ # limitations under the License. # -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +include device/generic/art/BoardConfigCommon.mk + TARGET_ARCH := x86 TARGET_CPU_ABI := x86 -TARGET_CPU_SMP := true TARGET_ARCH_VARIANT := silvermont -USE_CLANG_PLATFORM_BUILD := true diff --git a/silvermont/silvermont.mk b/silvermont/silvermont.mk index 079459a..8b8fe9f 100644 --- a/silvermont/silvermont.mk +++ b/silvermont/silvermont.mk @@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += \ art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) PRODUCT_NAME := silvermont PRODUCT_DEVICE := silvermont diff --git a/silvermont/vendorsetup.sh b/silvermont/vendorsetup.sh deleted file mode 100644 index 50e919b..0000000 --- a/silvermont/vendorsetup.sh +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2015 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. -# - -add_lunch_combo silvermont-eng |