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

Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot 2017-08-15 16:53:08 +00:00 committed by Android (Google) Code Review
parent d215d9038b 2999f29ea0
commit 1f8b6033cb
11 changed files with 86 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/product/aosp_arm64_a.mk
View File

@ -16,12 +16,11 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_64.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm64_a

7
target/product/aosp_arm64_ab.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_64.mk
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system
@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \
update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_arm64_ab

6
target/product/aosp_arm_a.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_32.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

6
target/product/aosp_arm_ab.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_32.mk
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system

7
target/product/aosp_x86_64_a.mk
View File

@ -16,12 +16,11 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_64.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_64_a

7
target/product/aosp_x86_64_ab.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_64.mk
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system
@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
update_engine \
update_verifier
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_NAME := aosp_x86_64_ab

6
target/product/aosp_x86_a.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_32.mk
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

6
target/product/aosp_x86_ab.mk
View File

@ -16,10 +16,10 @@
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/generic_arm64_a/
# system.prop.
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
include build/make/target/product/treble_common_32.mk
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system

5
target/product/treble_common.mk
View File

@ -14,6 +14,11 @@
# limitations under the License.
#
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
# Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true

22
target/product/treble_common_32.mk Normal file
View File

@ -0,0 +1,22 @@
#
# Copyright (C) 2017 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk

35
target/product/treble_common_64.mk Normal file
View File

@ -0,0 +1,35 @@
#
# Copyright (C) 2017 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
# /vendor/[build|default].prop when build split is on. In order to have sysprops
# on the generic system image, place them in build/make/target/board/
# treble_system.prop.
include build/make/target/product/treble_common.mk
# For now this will allow 64-bit apps, but still compile all apps with JNI
# for 32-bit only.
# Copy the 64-bit primary, 32-bit secondary zygote startup script
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc
# Set the zygote property to select the 64-bit primary, 32-bit secondary script
# This line must be parsed before the one in core_minimal.mk
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true