diff options
| author | Martin Stjernholm <mast@google.com> | 2021-01-21 00:23:41 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-01-27 20:27:39 +0000 |
| commit | 2a5f3d1d9be1c54cb7f03be8b7ce4566546b1039 (patch) | |
| tree | 537764cbc9630243d2584a172624c59216ad9126 | |
| parent | 39c9c511cd7f9b9027497c0ba407ec11ee695557 (diff) | |
| download | device_generic_art-2a5f3d1d9be1c54cb7f03be8b7ce4566546b1039.tar.gz device_generic_art-2a5f3d1d9be1c54cb7f03be8b7ce4566546b1039.tar.bz2 device_generic_art-2a5f3d1d9be1c54cb7f03be8b7ce4566546b1039.zip | |
Base art_module_* products off module_*.android-s-preview-1
They're more consistent and closer to the products used in
build_mainline_modules.sh.
In particular this avoids the special case in
build/make/target/board/generic_arm64/BoardConfig.mk where
TARGET_BUILD_APPS affects TARGET_2ND_ARCH_VARIANT for arm64 builds.
Test: art/build/build-art-module.sh - check that produced APEXes are
bit identical before and after the change.
Bug: 176171716
Change-Id: Iad847b8e718dc00e15a006853b36ae750d6b75a4
| -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 |