openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot 2017-09-07 02:50:17 +00:00 committed by Android (Google) Code Review
parent 418b291486 558f3dd79b
commit 032adc13c9
9 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/aosp_arm64_a.mk
View File

@ -21,8 +21,6 @@
include build/make/target/product/treble_common_64.mk include build/make/target/product/treble_common_64.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm64_a PRODUCT_NAME := aosp_arm64_a
PRODUCT_DEVICE := generic_arm64_a PRODUCT_DEVICE := generic_arm64_a
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_arm64_ab.mk
View File

@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \ update_engine \
update_verifier update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm64_ab PRODUCT_NAME := aosp_arm64_ab
PRODUCT_DEVICE := generic_arm64_ab PRODUCT_DEVICE := generic_arm64_ab
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_arm_a.mk
View File

@ -21,8 +21,6 @@
include build/make/target/product/treble_common_32.mk include build/make/target/product/treble_common_32.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm_a PRODUCT_NAME := aosp_arm_a
PRODUCT_DEVICE := generic_arm_a PRODUCT_DEVICE := generic_arm_a
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_arm_ab.mk
View File

@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \ update_engine \
update_verifier update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm_ab PRODUCT_NAME := aosp_arm_ab
PRODUCT_DEVICE := generic_arm_ab PRODUCT_DEVICE := generic_arm_ab
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_x86_64_a.mk
View File

@ -21,8 +21,6 @@
include build/make/target/product/treble_common_64.mk include build/make/target/product/treble_common_64.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_64_a PRODUCT_NAME := aosp_x86_64_a
PRODUCT_DEVICE := generic_x86_64_a PRODUCT_DEVICE := generic_x86_64_a
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_x86_64_ab.mk
View File

@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \ update_engine \
update_verifier update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_64_ab PRODUCT_NAME := aosp_x86_64_ab
PRODUCT_DEVICE := generic_x86_64_ab PRODUCT_DEVICE := generic_x86_64_ab
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_x86_a.mk
View File

@ -21,8 +21,6 @@
include build/make/target/product/treble_common_32.mk include build/make/target/product/treble_common_32.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_a PRODUCT_NAME := aosp_x86_a
PRODUCT_DEVICE := generic_x86_a PRODUCT_DEVICE := generic_x86_a
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

2
target/product/aosp_x86_ab.mk
View File

@ -27,8 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \ update_engine \
update_verifier update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_ab PRODUCT_NAME := aosp_x86_ab
PRODUCT_DEVICE := generic_x86_ab PRODUCT_DEVICE := generic_x86_ab
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

4
target/product/treble_common.mk
View File

@ -19,6 +19,10 @@
# on the generic system image, place them in build/make/target/board/ # on the generic system image, place them in build/make/target/board/
# treble_system.prop. # treble_system.prop.
# Generic system image inherits from AOSP with telephony
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
# Split selinux policy # Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_FULL_TREBLE_OVERRIDE := true