commit ca0744dc672c259d9de1afd5f63abcbc335ac177
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Mar 04 00:36:51 2021 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Thu Mar 04 00:36:51 2021 +0000
tree 537764cbc9630243d2584a172624c59216ad9126
parent 006a1affc98ad3292024512523485c58b2055abb
parent 7c8fb4fbc265cc4fc6de1a09269dde736d71e9d2

Snap for 7183507 from 7c8fb4fbc265cc4fc6de1a09269dde736d71e9d2 to sdk-release

Change-Id: I262f64263c8582f947e70bb6c586128b57289c59

art_module/art_module_arm.mk

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

art_module/art_module_arm64.mk

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

art_module/art_module_x86.mk

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

art_module/art_module_x86_64.mk

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