Move fake-jdk-tools here

mozilla-b2g · May 4, 2012 · 05c4dd7 · 05c4dd7
1 parent df8e642
commit 05c4dd7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/envsetup.sh b/envsetup.sh
@@ -1040,16 +1040,7 @@ function godir () {
 
 # Force JAVA_HOME to point to java 1.6 if it isn't already set
 function set_java_home() {
-    if [ ! "$JAVA_HOME" ]; then
+    export JAVA_HOME="$(gettop)/build/fake-jdk-tools"
-        case `uname -s` in
-            Darwin)
-                export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
-                ;;
-            *)
-                export JAVA_HOME=/usr/lib/jvm/java-6-sun
-                ;;
-        esac
-    fi
 }
 
 if [ "x$SHELL" != "x/bin/bash" ]; then

diff --git a/fake-jdk-tools/bin/jar b/fake-jdk-tools/bin/jar
@@ -0,0 +1 @@
+echo "Fake java 1.6.0 revisiion"
diff --git a/fake-jdk-tools/bin/java b/fake-jdk-tools/bin/java
@@ -0,0 +1 @@
+echo "Fake java 1.6.0 revisiion"
diff --git a/fake-jdk-tools/bin/javac b/fake-jdk-tools/bin/javac
@@ -0,0 +1 @@
+echo "Fake javac 1.6.0 revision"
diff --git a/fake-jdk-tools/jar b/fake-jdk-tools/jar
@@ -0,0 +1 @@
+echo "fake jar"
diff --git a/fake-jdk-tools/lib/tools.jar b/fake-jdk-tools/lib/tools.jar