summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2021-01-30 01:03:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-30 01:03:37 +0000
commitbbb474b643cc4f19efcb43a6c69f92b0d9aa6411 (patch)
tree537764cbc9630243d2584a172624c59216ad9126
parent426fecf95097ff4f1d7acbc39181ef588f5387f7 (diff)
parent2d041048b30a9b2657f571e8e416953a540ce867 (diff)
downloadart-bbb474b643cc4f19efcb43a6c69f92b0d9aa6411.tar.gz
Base art_module_* products off module_*. am: 2a5f3d1d9b am: 78aa5d35ff am: 146ded8937 am: 62bac68809 am: 2d041048b3
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1555281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I979adaf7e7b2918f3ed32c1525261f591b4b92b6
-rw-r--r--art_module/art_module_arm.mk3
-rw-r--r--art_module/art_module_arm64.mk3
-rw-r--r--art_module/art_module_x86.mk3
-rw-r--r--art_module/art_module_x86_64.mk3
4 files changed, 4 insertions, 8 deletions
diff --git a/art_module/art_module_arm.mk b/art_module/art_module_arm.mk
index 9d3929a..2811bf1 100644
--- a/art_module/art_module_arm.mk
+++ b/art_module/art_module_arm.mk
@@ -14,8 +14,7 @@
# limitations under the License.
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
+$(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
-PRODUCT_DEVICE := generic
diff --git a/art_module/art_module_arm64.mk b/art_module/art_module_arm64.mk
index b775600..933d5a6 100644
--- a/art_module/art_module_arm64.mk
+++ b/art_module/art_module_arm64.mk
@@ -14,8 +14,7 @@
# limitations under the License.
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
+$(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
-PRODUCT_DEVICE := generic_arm64
diff --git a/art_module/art_module_x86.mk b/art_module/art_module_x86.mk
index 7272ad4..3b4da4c 100644
--- a/art_module/art_module_x86.mk
+++ b/art_module/art_module_x86.mk
@@ -14,8 +14,7 @@
# limitations under the License.
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
+$(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
-PRODUCT_DEVICE := generic_x86
diff --git a/art_module/art_module_x86_64.mk b/art_module/art_module_x86_64.mk
index 7a16ff2..d55be8a 100644
--- a/art_module/art_module_x86_64.mk
+++ b/art_module/art_module_x86_64.mk
@@ -14,8 +14,7 @@
# limitations under the License.
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+$(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
-PRODUCT_DEVICE := generic_x86_64