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 9e1e4c04752f0113b36d8b4eeebe8af5f3c84a49 2 parents 3901aba + 76e16c6
@jonallengriffin authored
Showing with 14 additions and 10 deletions.
  1. +11 −7 Makefile
  2. +1 −1  gaia
  3. +1 −1  gecko
  4. +1 −1  glue/gonk/external/qemu
View
18 Makefile
@@ -202,7 +202,7 @@ gecko:
.PHONY: gonk
gonk:
@$(call DEP_CHECK,$(GONK_PATH)/out/.b2g-build-done,$(GONK_BASE), \
- $(call GONK_CMD,$(MAKE) $(MAKE_FLAGS) $(GONK_MAKE_FLAGS)) ; \
+ $(call GONK_CMD,$(MAKE) $(MAKE_FLAGS) $(GONK_MAKE_FLAGS) CONFIG_ESD=no ) ; \
$(if $(filter qemu,$(KERNEL)), \
cp $(GONK_PATH)/system/core/rootdir/init.rc.gonk \
$(GONK_PATH)/out/target/product/$(GONK)/root/init.rc))
@@ -481,6 +481,12 @@ gecko-install-hack: gecko
# Extract the newest tarball in the gecko objdir.
( cd $(OUT_DIR) && \
tar xvfz $$(ls -t $(GECKO_OBJDIR)/dist/b2g-*.tar.gz | head -n1) )
+ifneq ($(GONK_BASE),glue/gonk)
+ ( cd $(OUT_DIR) && \
+ mv b2g/b2g b2g/updater bin && \
+ ln -s ../bin/b2g b2g/b2g && \
+ ln -s ../bin/updater b2g/updater )
+endif
find $(GONK_PATH)/out -name "system.img" | xargs rm -f
@$(call GONK_CMD,$(MAKE) $(MAKE_FLAGS) $(GONK_MAKE_FLAGS) systemimage-nodeps)
@@ -646,7 +652,7 @@ SYMDIR=$(GONK_OBJDIR)/symbols
gdb-init-file:
echo "set solib-absolute-prefix $(SYMDIR)" > $(GDBINIT)
echo "set solib-search-path $(GECKO_OBJDIR)/dist/bin:$(GECKO_OBJDIR)/dist/lib:$(SYMDIR)/system/lib:$(SYMDIR)/system/lib/hw:$(SYMDIR)/system/lib/egl:$(and $(ANDROIDFS_DIR),$(ANDROIDFS_DIR)/symbols/system/lib:$(ANDROIDFS_DIR)/symbols/system/lib/hw:$(ANDROIDFS_DIR)/symbols/system/lib/egl)" >> $(GDBINIT)
- echo "target remote :$(GDB_PORT)" >> $(GDBINIT)
+ echo "target extended-remote :$(GDB_PORT)" >> $(GDBINIT)
.PHONY: attach-gdb
attach-gdb: attach-gdb-server gdb-init-file
@@ -654,17 +660,15 @@ attach-gdb: attach-gdb-server gdb-init-file
.PHONY: disable-auto-restart
disable-auto-restart: adb-check-version kill-b2g
- $(ADB) remount
- $(ADB) shell mv $(B2G_BIN) $(B2G_BIN).d
+ $(ADB) shell stop b2g
.PHONY: restore-auto-restart
restore-auto-restart: adb-check-version
- $(ADB) remount
- $(ADB) shell mv $(B2G_BIN).d $(B2G_BIN)
+ $(ADB) shell start b2g
.PHONY: run-gdb-server
run-gdb-server: adb-check-version forward-gdb-port kill-gdb-server disable-auto-restart
- $(ADB) shell LD_LIBRARY_PATH=/system/b2g gdbserver :$(GDB_PORT) $(B2G_BIN).d &
+ $(ADB) shell LD_LIBRARY_PATH=/system/b2g gdbserver --multi :$(GDB_PORT) $(B2G_BIN) &
sleep 1
.PHONY: run-gdb
2  gaia
@@ -1 +1 @@
-Subproject commit 22da198da04b62522bd5f92e19d3a4d67b54c479
+Subproject commit 8ac71b3dc6b26bbb1d4a2e739879fe30ab82c3ad
2  gecko
@@ -1 +1 @@
-Subproject commit 837faf6da50a606251171617d6438914373d4df0
+Subproject commit f80d82eaf82e99058b86f22f468519cb627a54ca
2  glue/gonk/external/qemu
@@ -1 +1 @@
-Subproject commit 14ee41d3268911e97e6fc4f417ac424336847f0a
+Subproject commit 2d88523d26c66692cdb3019e5b1bf252066eb32b
Please sign in to comment.
Something went wrong with that request. Please try again.