Skip to content

Commit b29ba3d

Browse files
committed
Remove native folder from openj9.test.sharedClasses.jvmti
- The native folder has been removed as the SharedClassesAPI native code has been moved to the OpenJ9 repo. related:adoptium/aqa-tests#5965 Signed-off-by: Anna Babu Palathingal <[email protected]>
1 parent b8ee9f8 commit b29ba3d

File tree

3 files changed

+3
-879
lines changed

3 files changed

+3
-879
lines changed

openj9.test.sharedClasses.jvmti/build.xml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
4747
<property name="openj9_test_sharedClasses_jvmti_module" value="test.sharedClasses.jvmti" />
4848
<property name="openj9_test_sharedClasses_jvmti_src_dir" value="src/${openj9_test_sharedClasses_jvmti_module}" />
4949
<property name="openj9_test_sharedClasses_jvmti_bin_dir" value="bin" />
50-
<property name="openj9_test_sharedClasses_jvmti_native_src_dir" value="${basedir}/src/native" />
51-
<property name="openj9_test_sharedClasses_jvmti_native_bin_dir" value="${basedir}/bin/native" />
52-
50+
5351
<property name="openj9_test_sharedClasses_jvmti_jar_file" value="${openj9_test_sharedClasses_jvmti_bin_dir}/${openj9_test_sharedClasses_jvmti_module}.jar" />
5452

5553
<!-- We need junit, stf, the sharedclasses stf extensions and the test.shardClasses tests to compile this project. -->
@@ -65,37 +63,12 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
6563
<target name="build-dependencies" depends="check-prereqs" >
6664
</target>
6765

68-
<target name="build" depends="check-prereqs, build-no-natives, build-natives">
66+
<target name="build" depends="check-prereqs, build-no-natives">
6967
</target>
7068

7169
<target name="build-no-natives" depends="check-prereqs, build-dependencies, check-prereqs, build-archives">
7270
</target>
73-
74-
<target name="build-natives" depends="check-prereqs, setup-native-build-command, build-natives-windows, build-natives-unix">
75-
</target>
76-
77-
<target name="setup-native-build-command">
78-
<echo message="building natives for java-platform ${java_platform}"/>
79-
<property name="openj9_test_sharedClasses_jvmti_native_build_command" value='${setup_windows_build_env}${MAKE} -C ${openj9_test_sharedClasses_jvmti_native_src_dir} SRCDIR=${openj9_test_sharedClasses_jvmti_native_src_dir} JAVA_HOME=${java_home} OUTDIR=${openj9_test_sharedClasses_jvmti_native_bin_dir}'/>
80-
<tempfile property="openj9_test_sharedClasses_jvmti_native_build_command_file" destDir="${java.io.tmpdir}" prefix="openj9.build.command."/>
81-
</target>
82-
83-
<target name="build-natives-windows" if="${windows_native_compiler_present}">
84-
<echo message="${openj9_test_sharedClasses_jvmti_native_build_command}"/>
85-
<echo message="${openj9_test_sharedClasses_jvmti_native_build_command}" file="${openj9_test_sharedClasses_jvmti_native_build_command_file}.bat"/>
86-
<exec executable="${openj9_test_sharedClasses_jvmti_native_build_command_file}.bat" failonerror="true"/>
87-
<delete file="${openj9_test_sharedClasses_jvmti_native_build_command_file}.bat" verbose="true"/>
88-
</target>
89-
90-
<target name="build-natives-unix" unless="${is_windows}">
91-
<echo message="${openj9_test_sharedClasses_jvmti_native_build_command}"/>
92-
<echo message="${openj9_test_sharedClasses_jvmti_native_build_command}" file="${openj9_test_sharedClasses_jvmti_native_build_command_file}.sh"/>
93-
<exec executable="/bin/sh" failonerror="true">
94-
<arg value="${openj9_test_sharedClasses_jvmti_native_build_command_file}.sh"/>
95-
</exec>
96-
<delete file="${openj9_test_sharedClasses_jvmti_native_build_command_file}.sh" verbose="true"/>
97-
</target>
98-
71+
9972
<target name="build-archives" depends="build-jar">
10073
</target>
10174

openj9.test.sharedClasses.jvmti/src/native/Makefile

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)