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

Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR"

This commit is contained in:
Logan Chien 2018-05-22 04:04:07 +00:00 committed by Gerrit Code Review
parent 6536378b37 86b52aec24
commit fcf4d7200a
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@ -476,6 +476,9 @@ $(call add-clean-step, rm -rf $(TARGET_COMMON_OUT_ROOT)/obj_asan/JAVA_LIBRARIES/
$(call add-clean-step, rm -rf $(TARGET_COMMON_OUT_ROOT)/obj_asan/APPS/*_intermediates/java-source-list)
$(call add-clean-step, rm -rf $(TARGET_COMMON_OUT_ROOT)/obj_asan/JAVA_LIBRARIES/*_intermediates/java-source-list)
# Remove stale init.noenforce.rc
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/gsi/init.noenforce.rc)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

6
core/Makefile
View File

@ -125,8 +125,12 @@ ifdef BOARD_VNDK_VERSION
else
FINAL_VENDOR_DEFAULT_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
endif
ifdef BOARD_VNDK_RUNTIME_DISABLE
FINAL_VENDOR_DEFAULT_PROPERTIES += ro.vndk.lite=true
endif
else
FINAL_VENDOR_DEFAULT_PROPERTIES :=
FINAL_VENDOR_DEFAULT_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
FINAL_VENDOR_DEFAULT_PROPERTIES += ro.vndk.lite=true
endif
FINAL_VENDOR_DEFAULT_PROPERTIES += \
$(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))

11
target/product/treble_common.mk
View File

@ -76,15 +76,14 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
# Support for the devices with no VNDK enforcing
# Support for the O-MR1 devices
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \
build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.rc
build/make/target/product/vndk/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc
# Name space configuration file for non-enforcing VNDK
PRODUCT_PACKAGES += \
ld.config.noenforce.txt
ld.config.vndk_lite.txt
# Set current VNDK version for GSI
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
ro.gsi.vndk.version=$(PLATFORM_VNDK_VERSION)
# Support addtional O-MR1 vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 27

4
target/product/vndk/init.gsi.rc
View File

@ -1,2 +1,2 @@
# If ro.vndk.version is not defined, import init.noenforce.rc
import /system/etc/init/gsi/init.${ro.vndk.version:-noenforce}.rc
# If ro.vndk.version is not defined, import init.vndk-27.rc.
import /system/etc/init/gsi/init.vndk-${ro.vndk.version:-27}.rc

5
target/product/vndk/init.noenforce.rc
View File

@ -1,5 +0,0 @@
on early-init
# If ro.vndk.version is not set, use ld.config.nonenforce.txt
export LD_CONFIG_FILE /system/etc/ld.config.noenforce.txt
# To use current VNDK libs, set ro.vndk.version to system vndk version
setprop ro.vndk.version ${ro.gsi.vndk.version}

3
target/product/vndk/init.vndk-27.rc Normal file
View File

@ -0,0 +1,3 @@
on early-init
# Set ro.vndk.version to 27 so that O-MR1-VENDOR can run latest GSI.
setprop ro.vndk.version 27