51512c558c
When TARGET_VNDK_USE_CORE_VARIANT is set to true, the vendor variant of
VNDK libraries are by default not installed. Instead, the core variant
will be used by vendor binaries at runtime.
To ensure the core variant of VNDK libraries are installed, we also add
a flag LOCAL_VNDK_DEPEND_ON_CORE_VARIANT to indicate that the vendor
variant module depends on the core variant module. This flag should be
set by Soong for all VNDK libraries without the vendor variant
installed. When the flag is set, the vendor variant binary is also
compared against the core variant binary to ensure they are
functionally identical.
As we are merging the two variants for some libraries, we need a new
link type to denote a module is usable as both native:vndk and
native:platform. We add native:platform_vndk for this.
Bug: 119423884
Test: With the corresponding Soong change, build with
TARGET_VNDK_USE_CORE_VARIANT set to true.
Test: Add a dummy VNDK library and a dummy vendor binary that depends
on it. Build with no-vendor-variant VNDK and check the core
variant is installed.
Test: Add conditional compilation based on __ANDROID_VNDK__ in the
dummy VNDK library and check build fails.
Change-Id: I40000f2728e8193212113c1ee950e9d697f2d40d
30 lines
727 B
Bash
Executable file
30 lines
727 B
Bash
Executable file
#!/bin/bash
|
|
set -e
|
|
|
|
STRIP_PATH="${1}"
|
|
CORE="${2}"
|
|
VENDOR="${3}"
|
|
|
|
stripped_core="${CORE}.vndk_lib_check.stripped"
|
|
stripped_vendor="${VENDOR}.vndk_lib_check.stripped"
|
|
|
|
function cleanup() {
|
|
rm -f ${stripped_core} ${stripped_vendor}
|
|
}
|
|
trap cleanup EXIT
|
|
|
|
function strip_lib() {
|
|
${STRIP_PATH} \
|
|
-i ${1} \
|
|
-o ${2} \
|
|
-d /dev/null \
|
|
--remove-build-id
|
|
}
|
|
|
|
strip_lib ${CORE} ${stripped_core}
|
|
strip_lib ${VENDOR} ${stripped_vendor}
|
|
if ! cmp -s ${stripped_core} ${stripped_vendor}; then
|
|
echo "VNDK library not in vndkMustUseVendorVariantList but has different core and vendor variant: $(basename ${CORE})"
|
|
echo "If the two variants need to have different runtime behavior, consider using libvndksupport."
|
|
exit 1
|
|
fi
|