diff options
author | Martin Stjernholm <mast@google.com> | 2021-01-29 23:09:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 23:09:42 +0000 |
commit | 146ded89374e6b0beafc90fd9c712ddc96cf062d (patch) | |
tree | 537764cbc9630243d2584a172624c59216ad9126 | |
parent | 9c514568fe34db7d375a7fd58d19dca31a5ee8c6 (diff) | |
parent | 78aa5d35ff900cb575aa27689b97d5b07d1f0231 (diff) | |
download | art-146ded89374e6b0beafc90fd9c712ddc96cf062d.tar.gz |
Base art_module_* products off module_*. am: 2a5f3d1d9b am: 78aa5d35ff
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1555281
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65f8f6054561c3dc792869814e8b00c3aaa574d1
-rw-r--r-- | art_module/art_module_arm.mk | 3 | ||||
-rw-r--r-- | art_module/art_module_arm64.mk | 3 | ||||
-rw-r--r-- | art_module/art_module_x86.mk | 3 | ||||
-rw-r--r-- | art_module/art_module_x86_64.mk | 3 |
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 |