Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f00b7aa3 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14339819

Change-Id: I2a9d60dd79388c6638476baecbafccfe0d68f684
parents 8e8017b1 a6920129

target/product/module_arm.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_arm64.mk

+3 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_x86.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_x86_64.mk

+3 −1
Original line number Diff line number Diff line
@@ -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