From 15b89d8fcdc5065ad96b36a5fb1ca662dc44c080 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 23 Dec 2021 22:18:42 +0000 Subject: [PATCH] Don't require current.txt order. There have been a lot of merge conflicts because of this file (and a few cases of people needing to merge changes internally because of it). Though, we really don't care about the order of the file. So, compare ignoring order. If there is a merge conflict in the future, we can change the order slightly, and we can gradually clean up the order over time, as needed (really, it's not important). Bug: N/A Test: file reordered as build-time check Change-Id: I955a2bd78872ff6d975bc494f10b2ed5e532c680 --- target/product/gsi/Android.mk | 4 ++-- target/product/gsi/current.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 0d788fad44..167ffcfcfb 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -60,11 +60,11 @@ else endif $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh - $(hide) ($(_READ_INTERNAL_VNDK_LIB_LIST) | \ + $(hide) ($(_READ_INTERNAL_VNDK_LIB_LIST) | sort | \ diff --old-line-format="Removed %L" \ --new-line-format="Added %L" \ --unchanged-line-format="" \ - $(LATEST_VNDK_LIB_LIST) - \ + <(cat $(LATEST_VNDK_LIB_LIST) | sort) - \ || ( echo -e $(_vndk_check_failure_message); exit 1 )) $(hide) mkdir -p $(dir $@) $(hide) touch $@ diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 52754d4250..255d3713b7 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -29,10 +29,10 @@ VNDK-SP: android.hardware.graphics.mapper@2.1.so VNDK-SP: android.hardware.graphics.mapper@3.0.so VNDK-SP: android.hardware.graphics.mapper@4.0.so VNDK-SP: android.hardware.renderscript@1.0.so +VNDK-SP: android.hidl.safe_union@1.0.so VNDK-SP: android.hidl.memory.token@1.0.so VNDK-SP: android.hidl.memory@1.0-impl.so VNDK-SP: android.hidl.memory@1.0.so -VNDK-SP: android.hidl.safe_union@1.0.so VNDK-SP: libRSCpuRef.so VNDK-SP: libRSDriver.so VNDK-SP: libRS_internal.so