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

Revert "Make module_* inherit aosp_*"

Browse Source 
This reverts commit 708b854c4a.

The only diffs induced by using module_* are those incurred from using
armv8 for the 64-bit variants.

Bug: 185789027
Test: diff tests in mainline-prod and sc-mainline-prod
Change-Id: I7ed5cf93d240a58b50b655b861dd60c6965aafff
This commit is contained in:
Anton Hansson
2021-04-29 11:59:12 +01:00
parent 9693d8bd60
commit 50b9eb21a0
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