summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2020-01-12 14:06:56 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-12 14:06:56 -0800
commit8654aa7294a06a5de98d3a656d13ad5400463bb3 (patch)
treefaf6f4540f32286490f2dac6df0fc041b31c14a0
parent0eedcfd7d0a0b22b87613f359c151afdaff4646e (diff)
parent92b40d2ff9aef1282b4f1a389553a64c76d97664 (diff)
downloaddevice_generic_art-8654aa7294a06a5de98d3a656d13ad5400463bb3.tar.gz
device_generic_art-8654aa7294a06a5de98d3a656d13ad5400463bb3.tar.bz2
device_generic_art-8654aa7294a06a5de98d3a656d13ad5400463bb3.zip
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES.
am: 92b40d2ff9 Change-Id: Ib67f71f8babacb2a2a101fd4d06d45af47ea650d
Diffstat
-rw-r--r--arm_krait/AndroidProducts.mk3
-rw-r--r--arm_krait/vendorsetup.sh17
-rw-r--r--arm_v7_v8/AndroidProducts.mk3
-rw-r--r--arm_v7_v8/vendorsetup.sh17
-rw-r--r--armv8/AndroidProducts.mk3
-rw-r--r--armv8/vendorsetup.sh17
-rw-r--r--armv8_kryo385/AndroidProducts.mk3
-rw-r--r--armv8_kryo385/vendorsetup.sh17
-rw-r--r--mips32r2_fp/AndroidProducts.mk3
-rw-r--r--mips32r2_fp/vendorsetup.sh17
-rw-r--r--mips32r2_fp_xburst/AndroidProducts.mk3
-rw-r--r--mips32r2_fp_xburst/vendorsetup.sh17
-rw-r--r--mips64r6/AndroidProducts.mk3
-rw-r--r--mips64r6/vendorsetup.sh17
-rw-r--r--silvermont/AndroidProducts.mk3
-rw-r--r--silvermont/vendorsetup.sh17
16 files changed, 24 insertions, 136 deletions
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/vendorsetup.sh b/arm_krait/vendorsetup.sh
deleted file mode 100644
index 2fb9b11..0000000
--- a/arm_krait/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2014 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 arm_krait-eng
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/vendorsetup.sh b/arm_v7_v8/vendorsetup.sh
deleted file mode 100644
index 6b0fcf0..0000000
--- a/arm_v7_v8/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2017 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 arm_v7_v8-eng
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/vendorsetup.sh b/armv8/vendorsetup.sh
deleted file mode 100644
index 2af5b76..0000000
--- a/armv8/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2014 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 armv8-eng
diff --git a/armv8_kryo385/AndroidProducts.mk b/armv8_kryo385/AndroidProducts.mk
index d5b7ded..1cfc959 100644
--- a/armv8_kryo385/AndroidProducts.mk
+++ b/armv8_kryo385/AndroidProducts.mk
@@ -16,3 +16,6 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/armv8_kryo385.mk
+
+COMMON_LUNCH_CHOICES := \
+ armv8_kryo385-eng
diff --git a/armv8_kryo385/vendorsetup.sh b/armv8_kryo385/vendorsetup.sh
deleted file mode 100644
index 5fdb42c..0000000
--- a/armv8_kryo385/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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.
-# 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 armv8_kryo385-eng
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/vendorsetup.sh b/mips32r2_fp/vendorsetup.sh
deleted file mode 100644
index cff24f0..0000000
--- a/mips32r2_fp/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 mips32r2_fp-eng
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/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/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/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:11:22 +0000