Change how we calculate image code.

lazar-mitrovic · lazar-mitrovic · commit f1c701e255bd · 2022-08-16T15:20:13.000+02:00
Signed-off-by: Lazar Mitrović &lt;lazar.mitrovic@oracle.com&gt;
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java
@@ -118,7 +118,7 @@ private ImageInfo() {
      * @since 19.0
      */
     public static boolean inImageCode() {
-        return System.getProperty(PROPERTY_IMAGE_CODE_KEY) != null;
+        return inImageBuildtimeCode() || inImageRuntimeCode();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private ImageInfo() {`
`118`	`118`	`* @since 19.0`
`119`	`119`	`*/`
`120`	`120`	`public static boolean inImageCode() {`
`121`		`- return System.getProperty(PROPERTY_IMAGE_CODE_KEY) != null;`
	`121`	`+ return inImageBuildtimeCode() \|\| inImageRuntimeCode();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`