StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2a9d60dd79388c6638476baecbafccfe0d68f684
This commit is contained in:
Anton Hansson
2021-05-05 08:38:07 +00:00
committed by Automerger Merge Worker
parent 8e8017b1aa a6920129d0
commit f00b7aa361
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/module_arm.mk
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

4
target/product/module_arm64.mk
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

3
target/product/module_x86.mk
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

4
target/product/module_x86_64.mk
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