Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/andreasgal/B2G

  • Loading branch information...
commit da7cde4cfcdf31fd42bb34f81310e795855aa2ae 2 parents 9e1e4c0 + fd32ad8
Jonathan Griffin authored
15 Makefile
View
@@ -55,7 +55,8 @@ FAKE_JDK_PATH ?= $(abspath fake-jdk-tools)
define GONK_CMD # $(call GONK_CMD,cmd)
export USE_CCACHE="yes" && \
- export PATH=$(FAKE_JDK_PATH):$$PATH && \
+ export JAVA_HOME=$(FAKE_JDK_PATH) && \
+ export PATH=$(FAKE_JDK_PATH)/bin:$$PATH && \
cd $(GONK_PATH) && \
. build/envsetup.sh && \
lunch $(GONK_TARGET) && \
@@ -388,6 +389,18 @@ config-qemu:
mkdir $(GONK_PATH)/device/qemu ) && \
echo OK
+.PHONY: config-qemu-ics
+config-qemu-ics: gonk-ics-sync
+ @echo "KERNEL = qemu-ics" > .config.mk && \
+ echo "KERNEL_PATH = ./boot/kernel-android-qemu" >> .config.mk && \
+ echo "GONK = generic" >> .config.mk && \
+ echo "GONK_BASE = glue/gonk-ics" >> .config.mk && \
+ echo "TOOLCHAIN_PATH = ./toolchains/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-" >> .config.mk && \
+ echo "EXTRA_INCLUDE = -include $(abspath Unicode.h)" >> .config.mk && \
+ echo "GONK_TARGET = generic-eng" >> .config.mk && \
+ echo "GONK_MAKE_FLAGS = TARGET_ARCH_VARIANT=armv7-a" >> .config.mk && \
+ echo OK
+
.PHONY: flash
# XXX Using target-specific targets for the time being. fastboot is
# great, but the sgs2 doesn't support it. Eventually we should find a
23 emu-ics.sh
View
@@ -0,0 +1,23 @@
+#!/bin/sh
+B2G_HOME=$(pwd)
+
+DBG_CMD=""
+if [ x"$DBG" != x"" ]; then
+ DBG_CMD="gdb -args"
+fi
+TAIL_ARGS=""
+if [ x"$GDBSERVER" != x"" ]; then
+ TAIL_ARGS="$TAIL_ARGS -s -S"
+fi
+
+export PATH=$PATH:$B2G_HOME/glue/gonk-ics/out/host/linux-x86/bin
+${DBG_CMD} $B2G_HOME/glue/gonk-ics/out/host/linux-x86/bin/emulator \
+ -kernel $B2G_HOME/glue/gonk-ics/prebuilts/qemu-kernel/arm/kernel-qemu-armv7 \
+ -sysdir $B2G_HOME/glue/gonk-ics/out/target/product/generic/ \
+ -data $B2G_HOME/glue/gonk-ics/out/target/product/generic/userdata.img \
+ -memory 512 \
+ -partition-size 512 \
+ -skindir $B2G_HOME/glue/gonk-ics/development/tools/emulator/skins \
+ -skin WVGA854 \
+ -verbose \
+ -qemu -cpu 'cortex-a8' $TAIL_ARGS
0  fake-jdk-tools/java → fake-jdk-tools/bin/jar
View
File renamed without changes
1  fake-jdk-tools/bin/java
View
@@ -0,0 +1 @@
+echo "Fake java 1.6.0 revisiion"
0  fake-jdk-tools/javac → fake-jdk-tools/bin/javac
View
File renamed without changes
0  fake-jdk-tools/more → fake-jdk-tools/bin/more
View
File renamed without changes
1  fake-jdk-tools/jar
View
@@ -0,0 +1 @@
+echo "fake jar"
0  fake-jdk-tools/lib/tools.jar
View
No changes.
Please sign in to comment.
Something went wrong with that request. Please try again.