diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-21 00:13:16 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-21 00:13:16 +0000 |
| commit | f85ce5c7b13e8ae81b2e59f45c25f27dcb76e834 (patch) | |
| tree | fbe5c6b24b53ba8eb39d865f0704e5d8b7262a8f | |
| parent | 11efef7a00287fb011f11348ff9fee33c7e1af3c (diff) | |
| parent | 5bac3bb5ca6fa61e82dbd047ae91371b15fd6be7 (diff) | |
| download | dalvik-android11-d2-release.tar.gz | |
Snap for 7092999 from 5bac3bb5ca6fa61e82dbd047ae91371b15fd6be7 to rvc-d2-releaseandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r45android-11.0.0_r44android-11.0.0_r42android-11.0.0_r41android11-d2-release
Change-Id: I6a4c061c0fcde01f1f26376d3fd7637eec35b02e
| -rwxr-xr-x | dx/etc/dx.bat | 34 | ||||
| -rwxr-xr-x | dx/etc/mainDexClasses.bat | 32 |
2 files changed, 55 insertions, 11 deletions
diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat index 654588617..f2e3857df 100755 --- a/dx/etc/dx.bat +++ b/dx/etc/dx.bat @@ -22,12 +22,34 @@ REM Set up prog to be the path of this script, including following symlinks, REM and set up progdir to be the fully-qualified pathname of its directory.
set prog=%~f0
-rem Check we have a valid Java.exe in the path.
-set java_exe=
-if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat"
-if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"
-if not defined java_exe goto :EOF
-
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+exit /b 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+exit /b 1
+
+:init
set jarfile=dx.jar
set "frameworkdir=%~dp0"
rem frameworkdir must not end with a dir sep.
diff --git a/dx/etc/mainDexClasses.bat b/dx/etc/mainDexClasses.bat index dc5f2c355..232635ca0 100755 --- a/dx/etc/mainDexClasses.bat +++ b/dx/etc/mainDexClasses.bat @@ -16,12 +16,34 @@ REM limitations under the License. REM don't modify the caller's environment
setlocal
-rem Check we have a valid Java.exe in the path.
-set java_exe=
-if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat"
-if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"
-if not defined java_exe goto :EOF
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+exit /b 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+exit /b 1
+:init
set baserules="%~dp0\mainDexClasses.rules"
set extrarules="%~dp0\mainDexClassesNoAapt.rules"
|