[android] switch to python offset tool (#15834)

[android] switch to python offset tool

And drop C# tool.

Fixes https://github.com/mono/mono/issues/9621

4 files changed, 16 insertions, 17 deletions

diff --git a/sdks/builds/android.mk b/sdks/builds/android.mk
index a5563e2b39f..92daa9a0452 100644
--- a/sdks/builds/android.mk
+++ b/sdks/builds/android.mk
@@ -17,6 +17,12 @@ android_ARCHIVE += android-sources android-tpn
 ADDITIONAL_PACKAGE_DEPS += $(android_SOURCES_DIR) $(android_TPN_DIR)
 endif
 
+ifeq ($(UNAME),Darwin)
+ANDROID_LIBCLANG = $(ANDROID_TOOLCHAIN_DIR)/ndk/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib
+else ifeq ($(UNAME),Linux)
+ANDROID_LIBCLANG = $(ANDROID_TOOLCHAIN_DIR)/ndk/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.8svn
+endif
+
 ##
 # Parameters:
 #  $(1): target
@@ -340,7 +346,7 @@ endif
 #  $(6): offsets dumper abi
 define AndroidCrossTemplate
 
-_android-$(1)_OFFSETS_DUMPER_ARGS=--gen-android --android-ndk="$$(ANDROID_TOOLCHAIN_DIR)/ndk"
+_android-$(1)_OFFSETS_DUMPER_ARGS=--libclang="$$(ANDROID_LIBCLANG)" --sysroot="$$(ANDROID_TOOLCHAIN_DIR)/ndk/sysroot"
 
 _android-$(1)_AR=ar
 _android-$(1)_AS=as
@@ -408,7 +414,7 @@ endif
 #  $(6): offsets dumper abi
 define AndroidCrossMXETemplate
 
-_android-$(1)_OFFSETS_DUMPER_ARGS=--gen-android --android-ndk="$$(ANDROID_TOOLCHAIN_DIR)/ndk"
+_android-$(1)_OFFSETS_DUMPER_ARGS=--libclang="$$(ANDROID_LIBCLANG)" --sysroot="$$(ANDROID_TOOLCHAIN_DIR)/ndk/sysroot"
 
 _android-$(1)_PATH=$$(MXE_PREFIX)/bin
 
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk
index 5e981e5bd1c..4bf77d3da43 100644
--- a/sdks/builds/ios.mk
+++ b/sdks/builds/ios.mk
@@ -21,8 +21,6 @@ ADDITIONAL_PACKAGE_DEPS += $(ios_FRAMEWORKS_DIR) $(ios_LIBS_DIR) $(ios_SOURCES_D
 
 ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
 
-USE_OFFSETS_TOOL_PY = 1
-
 ##
 # Device builds
 #
@@ -341,7 +339,7 @@ $(eval $(call iOSSimulatorTemplate,simwatch,i386-apple-darwin10,i386))
 #  ios-$(1)_CONFIGURE_FLAGS
 define iOSCrossTemplate
 
-_ios-$(1)_OFFSETS_DUMPER_ARGS=--libclang-path="$$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib" --sysroot="$(7)"
+_ios-$(1)_OFFSETS_DUMPER_ARGS=--libclang="$$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib" --sysroot="$(7)"
 _ios_$(1)_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
 
 _ios-$(1)_CC=$$(CCACHE) $$(_ios_$(1)_PLATFORM_BIN)/clang
diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk
index 42af7eff816..55cacc416ca 100644
--- a/sdks/builds/runtime.mk
+++ b/sdks/builds/runtime.mk
@@ -223,18 +223,9 @@ _cross-runtime_$(1)-$(2)_CONFIGURE_FLAGS= \
 
 .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure: | $$(if $$(IGNORE_PROVISION_LLVM),,provision-$(6))
 
-ifdef USE_OFFSETS_TOOL_PY
 $$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h: .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure | configure-$(1)-$(5)
 	$(MAKE) -C $(TOP)/tools/offsets-tool-py setup
 	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)
-else
-$$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h: .stamp-$(1)-$(2)-$$(CONFIGURATION)-configure $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe | configure-$(1)-$(5)
-	cd $$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION) && \
-		MONO_PATH=$$(TOP)/tools/offsets-tool/CppSharp/$$(if $$(filter $$(UNAME),Darwin),osx_32,$$(if $$(filter $$(UNAME),Linux),linux_64,$$(error "Unknown UNAME='$$(UNAME)'"))) \
-			mono $$(if $$(filter $$(UNAME),Darwin),--arch=32) --debug "$$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe" \
-				--abi $(7) --outfile "$$@" --mono "$$(TOP)" --targetdir "$$(TOP)/sdks/builds/$(1)-$(5)-$$(CONFIGURATION)" \
-					$$(_$(1)-$(2)_OFFSETS_DUMPER_ARGS)
-endif
 
 build-$(1)-$(2): $$(TOP)/sdks/builds/$(1)-$(2)-$$(CONFIGURATION)/$(4).h
 
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk
index c2d52fadaf2..d122debf25c 100644
--- a/sdks/builds/wasm.mk
+++ b/sdks/builds/wasm.mk
@@ -20,7 +20,11 @@ ZLIB_HEADERS = \
 	$(MONO_SUPPORT)/zlib.h  	\
 	$(MONO_SUPPORT)/zutil.h
 
-USE_OFFSETS_TOOL_PY = 1
+ifeq ($(UNAME),Darwin)
+WASM_LIBCLANG=$(EMSCRIPTEN_SDK_DIR)/upstream/lib/libclang.dylib
+else ifeq ($(UNAME),Linux)
+WASM_LIBCLANG=$(EMSCRIPTEN_SDK_DIR)/upstream/lib/libclang.so
+endif
 
 $(TOP)/sdks/builds/toolchains/emsdk:
 	git clone https://github.com/juj/emsdk.git $(EMSCRIPTEN_SDK_DIR)
@@ -151,7 +155,7 @@ endif
 #  $(6): offsets dumper abi
 define WasmCrossTemplate
 
-_wasm-$(1)_OFFSETS_DUMPER_ARGS=--emscripten-sdk="$$(EMSCRIPTEN_SDK_DIR)/upstream/emscripten" --libclang-path="$$(EMSCRIPTEN_LOCAL_SDK_DIR)/upstream/lib"
+_wasm-$(1)_OFFSETS_DUMPER_ARGS=--emscripten-sdk="$$(EMSCRIPTEN_SDK_DIR)/upstream/emscripten" --libclang="$$(WASM_LIBCLANG)"
 
 _wasm-$(1)_CONFIGURE_FLAGS= \
 	--disable-boehm \
@@ -183,7 +187,7 @@ $(eval $(call WasmCrossTemplate,cross,x86_64,wasm32,runtime,llvm-llvm64,wasm32-u
 #  $(6): offsets dumper abi
 define WasmCrossMXETemplate
 
-_wasm-$(1)_OFFSETS_DUMPER_ARGS=--emscripten-sdk="$$(EMSCRIPTEN_SDK_DIR)/upstream/emscripten" --libclang-path="$$(EMSCRIPTEN_LOCAL_SDK_DIR)/upstream/lib"
+_wasm-$(1)_OFFSETS_DUMPER_ARGS=--emscripten-sdk="$$(EMSCRIPTEN_SDK_DIR)/upstream/emscripten" --libclang="$$(WASM_LIBCLANG)"
 
 _wasm-$(1)_PATH=$$(MXE_PREFIX)/bin