Restoring authorship annotation for <trenin17@yandex-team.ru>. Commit 2 of 2.

build/conf/java.ymake.conf

@@ -10,7 +10,7 @@ macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) {
 }
 
 macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
-    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR 
+    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/:DEBUG.py} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT}  --mtl-root $MTL_ROOT ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
 }
 
@@ -173,7 +173,7 @@ multimodule DLL_JAVA {
         .PEERDIRSELF=JNI_DLL
         SET(SWIG_LANG jni_java)
         PEERDIR+=build/platform/java/jdk
-        PEERDIR+=$JDK_RESOURCE_PEERDIR 
+        PEERDIR+=$JDK_RESOURCE_PEERDIR
         .FINAL_TARGET=yes
     }
 }

build/conf/jbuild.ymake.conf

@@ -115,7 +115,7 @@ module DLL_JAVA: DLL {
     .EXTS=.o .obj .jsrc .java .mf
     .CMD=SWIG_DLL_JAR_CMD
     PEERDIR(build/platform/java/jdk)
-    PEERDIR+=$JDK_RESOURCE_PEERDIR 
+    PEERDIR+=$JDK_RESOURCE_PEERDIR
 
     PROPAGATES_MANAGEABLE_PEERS=yes
     SET(SWIG_LANG java)

build/conf/project_specific/maps/aar.conf

@@ -28,7 +28,7 @@ module MOBILE_DLL: DLL {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR) 
+    PEERDIR($JDK_RESOURCE_PEERDIR)
 
     SET(BIN_AAR_DIR $BINDIR/aar)
     SET(BIN_TMP_DIR $BINDIR/tmp)
@@ -88,7 +88,7 @@ ${input;hide:EXTRA_INPUTS} \
 --output-dir $BIN_AAR_DIR \
 --bundle-name unittest \
 --maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \ 
+&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
 && $FS_TOOLS md $BIN_APK_DIR \
 && $FS_TOOLS md $BIN_APK_DIR/res \
 && $COPY_CMD $_MOBILE_TEST_APK_TEMPLATE_DIR/Manifest.xml $BIN_APK_DIR/Manifest.xml \
@@ -106,7 +106,7 @@ ${input;hide:EXTRA_INPUTS} \
 --bundles $BIN_AAR_DIR/build/outputs/aar/unittest-${tolower:_BUNDLE_BUILD_TYPE}.aar $_MOBILE_TEST_APK_AAR_BUNDLES_VALUE \
 --library-name $_MOBILE_TEST_APK_LIBRARY_NAME \
 --maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \ 
+&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
 && $COPY_CMD $BIN_APK_DIR/build/outputs/apk/${tolower:_BUNDLE_BUILD_TYPE}/$REALPRJNAME.apk ${OUTPUT}
 
 _MOBILE_TEST_APK_EXTRA_INPUTS_VALUE=
@@ -127,7 +127,7 @@ module MOBILE_TEST_APK: DLL {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR) 
+    PEERDIR($JDK_RESOURCE_PEERDIR)
 
     SET(MODULE_PREFIX)
     SET(MODULE_SUFFIX .apk)
@@ -296,7 +296,7 @@ ${input;hide:EXTRA_INPUTS} \
 --maven-repos $_AAR_LOCAL_MAVEN_REPO_VALUE \
 $_AAR_GENERATE_DOC_VALUE \
 $_AAR_NO_STRIP_VALUE \
-&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \ 
+&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \
 && ${cwd:BINDIR} $COPY_CMD build/outputs/aar/${REALPRJNAME}-${tolower:_BUNDLE_BUILD_TYPE}.aar $TARGET \
 $_AAR_COPY_DOC_VALUE \
 && ${cwd:BINDIR} $COPY_CMD build/${suf=-pom.xml:REALPRJNAME} ${output;suf=-pom.xml:REALPRJNAME} \
@@ -324,7 +324,7 @@ module AAR: _BASE_UNIT {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR) 
+    PEERDIR($JDK_RESOURCE_PEERDIR)
 
     SET(BIN_TMP_DIR $BINDIR/tmp)
     SET(BIN_GRADLE_USER_HOME_DIR $BINDIR/gradle)

build/platform/java/jdk/jdk10/ya.make

@@ -1,20 +1,20 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK10 
-    ${JDK10_DARWIN} FOR DARWIN 
-    ${JDK10_LINUX} FOR LINUX 
-    ${JDK10_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS}) 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK10
+    ${JDK10_DARWIN} FOR DARWIN
+    ${JDK10_LINUX} FOR LINUX
+    ${JDK10_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS})
+ENDIF()
+
+END()

build/platform/java/jdk/jdk11/ya.make

@@ -1,31 +1,31 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK11 
-    ${JDK11_DARWIN} FOR DARWIN 
-    ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64 
-    ${JDK11_LINUX} FOR LINUX 
-    ${JDK11_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN AND ARCH_ARM64) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64}) 
-ELSEIF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS}) 
-ENDIF() 
- 
-IF(SANITIZER_TYPE == "address") 
-    IF(HOST_OS_LINUX) 
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN}) 
-    ELSE() 
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan) 
-    ENDIF() 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK11
+    ${JDK11_DARWIN} FOR DARWIN
+    ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64
+    ${JDK11_LINUX} FOR LINUX
+    ${JDK11_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN AND ARCH_ARM64)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64})
+ELSEIF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS})
+ENDIF()
+
+IF(SANITIZER_TYPE == "address")
+    IF(HOST_OS_LINUX)
+        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN})
+    ELSE()
+        MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan)
+    ENDIF()
+ENDIF()
+
+END()

build/platform/java/jdk/jdk12/ya.make

@@ -1,20 +1,20 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK12 
-    ${JDK12_DARWIN} FOR DARWIN 
-    ${JDK12_LINUX} FOR LINUX 
-    ${JDK12_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS}) 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK12
+    ${JDK12_DARWIN} FOR DARWIN
+    ${JDK12_LINUX} FOR LINUX
+    ${JDK12_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS})
+ENDIF()
+
+END()

build/platform/java/jdk/jdk13/ya.make

@@ -1,28 +1,28 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK13 
-    ${JDK13_DARWIN} FOR DARWIN 
-    ${JDK13_LINUX} FOR LINUX 
-    ${JDK13_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS}) 
-ENDIF() 
- 
-IF(SANITIZER_TYPE == "address") 
-    IF(HOST_OS_LINUX) 
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN}) 
-    ELSE() 
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan) 
-    ENDIF() 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK13
+    ${JDK13_DARWIN} FOR DARWIN
+    ${JDK13_LINUX} FOR LINUX
+    ${JDK13_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS})
+ENDIF()
+
+IF(SANITIZER_TYPE == "address")
+    IF(HOST_OS_LINUX)
+        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
+    ELSE()
+        MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan)
+    ENDIF()
+ENDIF()
+
+END()

build/platform/java/jdk/jdk14/ya.make

@@ -1,20 +1,20 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK14 
-    ${JDK14_DARWIN} FOR DARWIN 
-    ${JDK14_LINUX} FOR LINUX 
-    ${JDK14_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS}) 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK14
+    ${JDK14_DARWIN} FOR DARWIN
+    ${JDK14_LINUX} FOR LINUX
+    ${JDK14_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS})
+ENDIF()
+
+END()

build/platform/java/jdk/jdk15/ya.make

@@ -1,22 +1,22 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK15 
-    ${JDK15_DARWIN} FOR DARWIN 
-    ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64 
-    ${JDK15_LINUX} FOR LINUX 
-    ${JDK15_WINDOWS} FOR WIN32 
-) 
-IF(OS_DARWIN AND ARCH_ARM64) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64}) 
-ELSEIF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS}) 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK15
+    ${JDK15_DARWIN} FOR DARWIN
+    ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64
+    ${JDK15_LINUX} FOR LINUX
+    ${JDK15_WINDOWS} FOR WIN32
+)
+IF(OS_DARWIN AND ARCH_ARM64)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64})
+ELSEIF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS})
+ENDIF()
+
+END()

build/platform/java/jdk/jdk16/ya.make

@@ -1,23 +1,23 @@
-OWNER(trenin17) 
-RESOURCES_LIBRARY() 
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
- 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
-    JDK16 
-    ${JDK16_DARWIN} FOR DARWIN 
-    ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64 
-    ${JDK16_LINUX} FOR LINUX 
-    ${JDK16_WINDOWS} FOR WIN32 
-) 
- 
-IF(OS_DARWIN AND ARCH_ARM64) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64}) 
-ELSEIF(OS_DARWIN) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN}) 
-ELSEIF(OS_LINUX) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX}) 
-ELSEIF(OS_WINDOWS) 
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS}) 
-ENDIF() 
- 
-END() 
+OWNER(trenin17)
+RESOURCES_LIBRARY()
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+    JDK16
+    ${JDK16_DARWIN} FOR DARWIN
+    ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64
+    ${JDK16_LINUX} FOR LINUX
+    ${JDK16_WINDOWS} FOR WIN32
+)
+
+IF(OS_DARWIN AND ARCH_ARM64)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64})
+ELSEIF(OS_DARWIN)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN})
+ELSEIF(OS_LINUX)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX})
+ELSEIF(OS_WINDOWS)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS})
+ENDIF()
+
+END()