From c193ae4c04d7495a230468e8450cd5613226535e Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 23 May 2019 13:49:53 +0200 Subject: [PATCH] Fix typo in APEX_LIBS_ABSENCE_CHECK_EXCLUDE arm64 guest libraries are located in lib64/arm64 Bug: http://b/77159578 Test: lunch cf_x86_64_phone-userdebug in internal master; mm -j48 dist Change-Id: I9f1f9426cbaed0a269126cb242e1a6df9249b167 --- core/main.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/main.mk b/core/main.mk index 0225c8920e..b423422add 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1253,14 +1253,14 @@ DISABLE_APEX_LIBS_ABSENCE_CHECK ?= # Bionic should not be in /system, except for the bootstrap instance. APEX_LIBS_ABSENCE_CHECK_EXCLUDE := lib/bootstrap lib64/bootstrap -# Exclude lib/arm and lib/arm64 which contain the native bridge proxy libs. They +# Exclude lib/arm and lib64/arm64 which contain the native bridge proxy libs. They # are compiled for the guest architecture and used with an entirely different # linker config. The native libs are then linked to as usual via exported # interfaces, so the proxy libs do not violate the interface boundaries on the # native architecture. # TODO(b/130630776): Introduce a make variable for the appropriate directory # when native bridge is active. -APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/arm lib/arm64 +APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/arm lib64/arm64 # Exclude vndk-* subdirectories which contain prebuilts from older releases. APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-%