From d9fed02138eac2797f27fa08120f2d2e6a87da35 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Thu, 30 Nov 2017 18:55:10 +0800 Subject: [PATCH] Enable VNDK for aosp_x86 and aosp_x86_64 When VNDK version is not enabled, libminijail.so are built under system directory. It is not found in GSI, though. Enable VNDK version causes it to be built under vendor directory. Bug: 69395141 Test: Both of the following 2 products can boot to home screen. $ lunch aosp_x86-userdebug; m -j; emulator $ lunch aosp_x86_64-userdebug; m -j; emulator Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11 Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11 (cherry picked from commit 532d5adf7b672f90920d2f10ecf23e9b4eeb8ac0) --- target/board/generic_x86/BoardConfig.mk | 2 ++ target/board/generic_x86_64/BoardConfig.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 0b39af1f9..f8fb88f7d 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -56,6 +56,8 @@ BOARD_SEPOLICY_DIRS += \ build/target/board/generic/sepolicy \ build/target/board/generic_x86/sepolicy +BOARD_VNDK_VERSION := current + # Enable A/B update TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 3a4bde646..aea1a0aa2 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -59,6 +59,8 @@ BOARD_SEPOLICY_DIRS += \ build/target/board/generic/sepolicy \ build/target/board/generic_x86/sepolicy +BOARD_VNDK_VERSION := current + # Enable A/B update TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true