Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1539)

Unified Diff: sdk/bin/dart2js

Issue 2340813004: Revert "Use checked-in .package file for building and testing" (Closed)
Patch Set: Fix more test and build failures Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/observatory/observatory.gypi ('k') | sdk/bin/dart2js.bat » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/bin/dart2js
diff --git a/sdk/bin/dart2js b/sdk/bin/dart2js
index 248ab07de30f9cee3fab6f2207ae651d5c778955..17559bf13b9abd7caae671c953d10a041418bfbf 100755
--- a/sdk/bin/dart2js
+++ b/sdk/bin/dart2js
@@ -52,41 +52,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
DART2JS="$DART_ROOT/pkg/compiler/lib/src/dart2js.dart"
-if [[ `uname` == 'Darwin' ]]; then
- OUT_DIR="$DART_ROOT/xcodebuild/"
-else
- OUT_DIR="$DART_ROOT/out/"
-fi
-
-if [ -z "$DART_CONFIGURATION" ];
-then
- DIRS=$( ls "$OUT_DIR" )
- # list of possible configurations in decreasing desirability
- CONFIGS=("ReleaseX64" "ReleaseIA32" "DebugX64" "DebugIA32"
- "ReleaseARM" "ReleaseARM64" "ReleaseARMV5TE" "ReleaseMIPS"
- "DebugARM" "DebugARM64" "DebugARMV5TE" "DebugMIPS")
- DART_CONFIGURATION="None"
- for CONFIG in ${CONFIGS[*]}
- do
- for DIR in $DIRS;
- do
- if [ "$CONFIG" = "$DIR" ];
- then
- # choose most desirable configuration that is available and break
- DART_CONFIGURATION="$DIR"
- break 2
- fi
- done
- done
- if [ "$DART_CONFIGURATION" = "None" ]
- then
- echo "No valid dart configuration found in $OUT_DIR"
- exit 1
- fi
-fi
-
-BUILD_DIR="$OUT_DIR$DART_CONFIGURATION"
-
-PACKAGE_ROOT="$BUILD_DIR/packages/"
-
-exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@"
+exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@"
« no previous file with comments | « runtime/observatory/observatory.gypi ('k') | sdk/bin/dart2js.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698