aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/project_specific
diff options
context:
space:
mode:
authortrenin17 <trenin17@yandex-team.ru>2022-02-10 16:51:09 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:51:09 +0300
commitb342c7befcbe40ed54f8d2f8968ad241b71e2701 (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8 /build/conf/project_specific
parent7d9e9dd650ccaad923d6b1ce79baaa3a15b740ae (diff)
downloadydb-b342c7befcbe40ed54f8d2f8968ad241b71e2701.tar.gz
Restoring authorship annotation for <trenin17@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/conf/project_specific')
-rw-r--r--build/conf/project_specific/maps/aar.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/conf/project_specific/maps/aar.conf b/build/conf/project_specific/maps/aar.conf
index 51c939c424..780ff38984 100644
--- a/build/conf/project_specific/maps/aar.conf
+++ b/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)