Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42efe57 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Deprecate VNDK-lite support from Legacy GSI 

The VNDK-lite is deprecated from S. Which is used to support the
devices without enabling VNDK.

The patch removes VNDK-lite from Legacy GSI. Also, reboot the
device without enabling VNDK in both non-Legacy and Legacy GSI.

Bug: 158719241
Test: boot aosp_arm64-userdebug on a Pixel 3 device
Test: boot aosp_arm64_ab-userdebug on a Pixel 2 device
Change-Id: I70a944bb5a2a0347ab753d29eca3d1bfcae54526
parent bf0c1b7b

target/product/gsi/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -211,3 +211,13 @@ LOCAL_SYSTEM_EXT_MODULE := true 
LOCAL_MODULE_RELATIVE_PATH := init



include $(BUILD_PREBUILT)





include $(CLEAR_VARS)

LOCAL_MODULE := init.vndk-nodef.rc

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := init



include $(BUILD_PREBUILT)

target/product/gsi/init.gsi.rc

+2 −0
Original line number Diff line number Diff line 
#

# Android init script for GSI required initialization

#



import /system/system_ext/etc/init/init.vndk-${ro.vndk.version:-nodef}.rc

target/product/gsi/init.legacy-gsi.rc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# If ro.vndk.version is not defined, import init.vndk-27.rc.

import /system/etc/init/gsi/init.vndk-${ro.vndk.version:-27}.rc

target/product/gsi/init.vndk-27.rc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
on early-init

    # Set ro.vndk.version to 27 so that O-MR1-VENDOR can run latest GSI.

    setprop ro.vndk.version 27

target/product/gsi/init.vndk-nodef.rc

0 → 100644
+3 −0
Original line number Diff line number Diff line 
on early-init

    # Must define BOARD_VNDK_VERSION

    exec - root -- /system/bin/reboot bootloader