summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-01-31 02:02:28 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-01-31 02:02:28 +0000
commita90d4e8c2fcebc34a0f1a435b1199d27f39065a4 (patch)
tree537764cbc9630243d2584a172624c59216ad9126
parent1421e9ae2fa13d1bcf364084b535e7bd35fab01e (diff)
parentbbb474b643cc4f19efcb43a6c69f92b0d9aa6411 (diff)
downloadart-a90d4e8c2fcebc34a0f1a435b1199d27f39065a4.tar.gz
Snap for 7113688 from bbb474b643cc4f19efcb43a6c69f92b0d9aa6411 to tm-release
Change-Id: I54885e60be005523a9b67d1c1d3acf9cabefbac5
-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