Merge "Revert "Make module_* inherit aosp_*"" into mainline-prod

This commit is contained in:
Anton Hansson 2021-05-05 08:08:56 +00:00 committed by Android (Google) Code Review
commit a6920129d0
4 changed files with 10 additions and 4 deletions

View file

@ -14,7 +14,8 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_arm
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_arm

View file

@ -14,7 +14,9 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_arm64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_arm64

View file

@ -14,7 +14,8 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_x86
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_x86

View file

@ -14,7 +14,9 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_x86_64