Remove Android nanort overlay

android/cmake/PanoPainterAndroidLegacyCompat.cmake

@@ -1,19 +0,0 @@
-set(PP_ANDROID_LEGACY_COMPAT_DIR "${CMAKE_CURRENT_LIST_DIR}")
-
-function(pp_configure_legacy_nanort_overlay target_name)
-	set(nanort_source "${PP_ANDROID_LEGACY_COMPAT_DIR}/../../libs/nanort/nanort.h")
-	set(nanort_overlay_dir "${CMAKE_CURRENT_BINARY_DIR}/generated/nanort_compat")
-	set(nanort_overlay_header "${nanort_overlay_dir}/nanort.h")
-
-	file(READ "${nanort_source}" nanort_header)
-	string(REPLACE
-		"  const size_t vertex_stride_bytes_;"
-		"  size_t vertex_stride_bytes_;"
-		nanort_header
-		"${nanort_header}")
-
-	file(MAKE_DIRECTORY "${nanort_overlay_dir}")
-	file(WRITE "${nanort_overlay_header}" "${nanort_header}")
-
-	target_include_directories(${target_name} BEFORE PRIVATE "${nanort_overlay_dir}")
-endfunction()

android/cmake/PanoPainterAndroidVendorPatches.cmake

@@ -0,0 +1,20 @@
+set(PP_ANDROID_VENDOR_PATCH_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+function(pp_apply_android_nanort_patch)
+	set(nanort_header "${PP_ANDROID_VENDOR_PATCH_DIR}/../../libs/nanort/nanort.h")
+	file(READ "${nanort_header}" nanort_contents)
+
+	set(nanort_before "  const size_t vertex_stride_bytes_;")
+	set(nanort_after "  size_t vertex_stride_bytes_;")
+
+	if(nanort_contents MATCHES "${nanort_before}")
+		string(REPLACE
+			"${nanort_before}"
+			"${nanort_after}"
+			nanort_contents
+			"${nanort_contents}")
+		file(WRITE "${nanort_header}" "${nanort_contents}")
+	elseif(NOT nanort_contents MATCHES "${nanort_after}")
+		message(FATAL_ERROR "Unexpected nanort.h layout; Android nanort patch could not be applied")
+	endif()
+endfunction()