Clean up unused art_module_* products. am: 2f17a53a2a

Original change: https://android-review.googlesource.com/c/device/generic/art/+/2631111

Change-Id: Ia0d9fb1957355c65286be35b15987c27b2736477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 0 insertions, 124 deletions

diff --git a/art_module/AndroidProducts.mk b/art_module/AndroidProducts.mk
deleted file mode 100644
index cb219cb..0000000
--- a/art_module/AndroidProducts.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/art_module_arm.mk \
-    $(LOCAL_DIR)/art_module_arm64.mk \
-    $(LOCAL_DIR)/art_module_x86.mk \
-    $(LOCAL_DIR)/art_module_x86_64.mk \
diff --git a/art_module/art_module.mk b/art_module/art_module.mk
deleted file mode 100644
index 39bda5b..0000000
--- a/art_module/art_module.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-# Enable ART Module top level apex/sdk/module_export modules. When they are
-# enabled the ART Module prebuilts (packages/modules/ArtPrebuilt and
-# prebuilts/module_sdk/art) cannot be present with prefer:true in the build
-# tree.
-# TODO(b/174997203): Clean up the art_module_* products when there is a better
-# way to switch between prebuilts and sources.
-$(call soong_config_set,art_module,source_build,true)
diff --git a/art_module/art_module_arm.mk b/art_module/art_module_arm.mk
deleted file mode 100644
index 2811bf1..0000000
--- a/art_module/art_module_arm.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_arm
diff --git a/art_module/art_module_arm64.mk b/art_module/art_module_arm64.mk
deleted file mode 100644
index 933d5a6..0000000
--- a/art_module/art_module_arm64.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm64.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_arm64
diff --git a/art_module/art_module_x86.mk b/art_module/art_module_x86.mk
deleted file mode 100644
index 3b4da4c..0000000
--- a/art_module/art_module_x86.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_x86.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_x86
diff --git a/art_module/art_module_x86_64.mk b/art_module/art_module_x86_64.mk
deleted file mode 100644
index d55be8a..0000000
--- a/art_module/art_module_x86_64.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2020 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.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_x86_64.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_x86_64