Merge "Don't require current.txt order." am: 9ca3c34646

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

Change-Id: I8b0516bc88a7ff47beff54f3c9ca5127b1244da1
This commit is contained in:
Steven Moreland 2022-01-05 22:25:21 +00:00 committed by Automerger Merge Worker
commit 8e9e313bf4
2 changed files with 3 additions and 3 deletions

View file

@ -60,11 +60,11 @@ else
endif endif
$(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh $(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" \ diff --old-line-format="Removed %L" \
--new-line-format="Added %L" \ --new-line-format="Added %L" \
--unchanged-line-format="" \ --unchanged-line-format="" \
$(LATEST_VNDK_LIB_LIST) - \ <(cat $(LATEST_VNDK_LIB_LIST) | sort) - \
|| ( echo -e $(_vndk_check_failure_message); exit 1 )) || ( echo -e $(_vndk_check_failure_message); exit 1 ))
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) touch $@ $(hide) touch $@

View file

@ -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@3.0.so
VNDK-SP: android.hardware.graphics.mapper@4.0.so VNDK-SP: android.hardware.graphics.mapper@4.0.so
VNDK-SP: android.hardware.renderscript@1.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.token@1.0.so
VNDK-SP: android.hidl.memory@1.0-impl.so VNDK-SP: android.hidl.memory@1.0-impl.so
VNDK-SP: android.hidl.memory@1.0.so VNDK-SP: android.hidl.memory@1.0.so
VNDK-SP: android.hidl.safe_union@1.0.so
VNDK-SP: libRSCpuRef.so VNDK-SP: libRSCpuRef.so
VNDK-SP: libRSDriver.so VNDK-SP: libRSDriver.so
VNDK-SP: libRS_internal.so VNDK-SP: libRS_internal.so