Move offsets-tool into mono/tools (#18830)mono-6.10.0.73

Backporting this since we see errors during `pip install` on the Android Mono SDKs build on Linux and with this we're removing the call to pip (it wasn't needed).

Backport of #18783.

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

10 files changed, 6 insertions, 20 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 48d2993b4e3..0d8cde93d65 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -116,6 +116,8 @@
 
 /mono/sgen @BrzVlad @lambdageek
 
+/mono/tools/offsets-tool @lewurm @rolfbjarne
+
 /mono/utils @vargaz @lewurm @lambdageek
 /mono/utils/atomic* @lewurm @vargaz
 /mono/utils/mono-hwcap* @lewurm @vargaz
@@ -156,6 +158,5 @@
 /tools @lambdageek @vargaz
 /tools/locale-builder @marek-safar @egorbo
 /tools/nuget-hash-extractor @marek-safar @radical @akoeplinger
-/tools/offsets-tool @lewurm @rolfbjarne
 /tools/pedump @lambdageek @lewurm
 /tools/sgen @brzvlad @vargaz @naricc
diff --git a/.gitignore b/.gitignore
index 58cbf3fcd04..f877304eae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,8 +139,6 @@ llvm/usr/
 sdks/builds/llvm-*/
 sdks/builds/android-*/
 mcs/build/compiler-server.log
-tools/offsets-tool-py/offtool/
-tools/offsets-tool-py/clang/__pycache__
 
 ##############################################################################
 # Arcade output directories
diff --git a/mono/tools/offsets-tool/.gitignore b/mono/tools/offsets-tool/.gitignore
new file mode 100644
index 00000000000..0d20b6487c6
--- /dev/null
+++ b/mono/tools/offsets-tool/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/tools/offsets-tool-py/README.md b/mono/tools/offsets-tool/README.md
index d997b0e82ec..0dcfe0f1a27 100644
--- a/tools/offsets-tool-py/README.md
+++ b/mono/tools/offsets-tool/README.md
@@ -1,5 +1,4 @@
 This is a tool to generate offsets file for use by the mono cross compilers.
 
 It depends on python and libclang. The 'clang' directory contains the python bindings to libclang, they are taken from:
-https://github.com/llvm/llvm-project/commits/master/clang/bindings/python/clang
-rev 8a12e40185cd0ce7031e6abab4af12e6fc923110
+https://github.com/llvm/llvm-project/tree/8a12e40185cd0ce7031e6abab4af12e6fc923110/clang/bindings/python/clang
diff --git a/tools/offsets-tool-py/clang/__init__.py b/mono/tools/offsets-tool/clang/__init__.py
index 14944b63e6d..14944b63e6d 100644
--- a/tools/offsets-tool-py/clang/__init__.py
+++ b/mono/tools/offsets-tool/clang/__init__.py
diff --git a/tools/offsets-tool-py/clang/cindex.py b/mono/tools/offsets-tool/clang/cindex.py
index 8e5a9fe0068..8e5a9fe0068 100644
--- a/tools/offsets-tool-py/clang/cindex.py
+++ b/mono/tools/offsets-tool/clang/cindex.py
diff --git a/tools/offsets-tool-py/clang/enumerations.py b/mono/tools/offsets-tool/clang/enumerations.py
index 520e1346d3e..520e1346d3e 100644
--- a/tools/offsets-tool-py/clang/enumerations.py
+++ b/mono/tools/offsets-tool/clang/enumerations.py
diff --git a/tools/offsets-tool-py/offsets-tool.py b/mono/tools/offsets-tool/offsets-tool.py
index f568a132b7e..f568a132b7e 100644
--- a/tools/offsets-tool-py/offsets-tool.py
+++ b/mono/tools/offsets-tool/offsets-tool.py
diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk
index 9f3c00aea50..a4972125574 100644
--- a/sdks/builds/runtime.mk
+++ b/sdks/builds/runtime.mk
@@ -220,8 +220,8 @@ _cross-runtime_$(1)-$(2)_CONFIGURE_FLAGS= \
 
 .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure: | $$(if $$(IGNORE_PROVISION_LLVM),,provision-$(6))
 
-$$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h: .stamp-offsets-tool-py-setup .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure | configure-$(1)-$(5)
-	. $(TOP)/tools/offsets-tool-py/offtool/bin/activate && PYTHONPATH=$(TOP)/tools/offsets-tool-py python3 $(TOP)/tools/offsets-tool-py/offsets-tool.py --targetdir="$$(TOP)/sdks/builds/$(1)-$(5)-$$(CONFIGURATION)" --abi=$(7) --monodir="$$(TOP)" --outfile="$$@" $$(_$(1)-$(2)_OFFSETS_DUMPER_ARGS)
+$$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h: .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure | configure-$(1)-$(5)
+	python3 $(TOP)/mono/tools/offsets-tool/offsets-tool.py --targetdir="$$(TOP)/sdks/builds/$(1)-$(5)-$$(CONFIGURATION)" --abi=$(7) --monodir="$$(TOP)" --outfile="$$@" $$(_$(1)-$(2)_OFFSETS_DUMPER_ARGS)
 
 build-$(1)-$(2): $$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h
 
@@ -234,10 +234,6 @@ $(1)_ARCHIVE += $(6)
 
 endef
 
-.stamp-offsets-tool-py-setup:
-	$(MAKE) -C $(TOP)/tools/offsets-tool-py setup
-	touch $@
-
 ##
 # Parameters:
 #  $(1): product
diff --git a/tools/offsets-tool-py/Makefile b/tools/offsets-tool-py/Makefile
deleted file mode 100644
index 5c331b06887..00000000000
--- a/tools/offsets-tool-py/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-ACTIVATE=offtool/bin/activate
-
-setup: $(ACTIVATE)
-
-$(ACTIVATE):
-	python3 -m pip install --user virtualenv
-	# `virtualenv` might not end up in $PATH
-	python3 -m virtualenv offtool
-