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

Commit 140d9ea6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add more details to divergent vndk lib error." am: e9bceb66 am:... 

Merge "Add more details to divergent vndk lib error." am: e9bceb66 am: d90ae697 am: 34f95ab9 am: 8b0ae9a4

Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: Ia060be7564a82de356b136c025562637ad37b445
parents 443369ab 8b0ae9a4

tools/check_identical_lib.sh

+14 −2
Original line number Diff line number Diff line
@@ -26,7 +26,19 @@ function strip_lib() { 
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."

  echo "ERROR: VNDK library $(basename ${CORE%.so}) has different core and" \

    "vendor variants! This means that the copy used in the system.img/etc" \

    "and vendor.img/etc images are different. In order to preserve space on" \

    "some devices, it is helpful if they are the same. Frequently, " \

    "libraries are different because they or their dependencies compile" \

    "things based on the macro '__ANDROID_VNDK__' or they specify custom" \

    "options under 'target: { vendor: { ... } }'. Here are some possible" \

    "resolutions:"

  echo "ERROR: 1). Remove differences, possibly using the libvndksupport" \

    "function android_is_in_vendor_process in order to turn this into a" \

    "runtime difference."

  echo "ERROR: 2). Add the library to the VndkMustUseVendorVariantList" \

    "variable in build/soong/cc/config/vndk.go, which is used to" \

    "acknowledge this difference."

  exit 1

fi