Skip to content
Browse files

Merge branch 'master' into oprofile_update_01

  • Loading branch information...
2 parents c974d26 + d7ed2e8 commit 6e945cee32738c704b1a6e5b4a251ce4e4570df2 @changyihsin changyihsin committed Mar 7, 2012
Showing with 7 additions and 4 deletions.
  1. +4 −1 Makefile
  2. +1 −1 gaia
  3. +1 −1 gecko
  4. +1 −1 glue/gonk/device/samsung/crespo
View
5 Makefile
@@ -307,6 +307,9 @@ $(DOWNLOAD_PATH)/extract-nxp-crespo4g.sh: $(DOWNLOAD_PATH)/nxp-crespo4g-$(NEXUS_
$(DOWNLOAD_PATH)/extract-samsung-crespo4g.sh: $(DOWNLOAD_PATH)/samsung-crespo4g-$(NEXUS_S_BUILD)-9474e48f.tgz
cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@
+$(DOWNLOAD_PATH)/extract-akm-crespo.sh: $(DOWNLOAD_PATH)/akm-crespo-$(NEXUS_S_BUILD)-5367f21c.tgz
+ cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@
+
$(DOWNLOAD_PATH)/extract-broadcom-crespo.sh: $(DOWNLOAD_PATH)/broadcom-crespo-$(NEXUS_S_BUILD)-fb8eed0c.tgz
cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@
@@ -323,7 +326,7 @@ $(DOWNLOAD_PATH)/extract-samsung-crespo.sh: $(DOWNLOAD_PATH)/samsung-crespo-$(NE
blobs-nexuss4g: $(DOWNLOAD_PATH)/extract-broadcom-crespo4g.sh $(DOWNLOAD_PATH)/extract-imgtec-crespo4g.sh $(DOWNLOAD_PATH)/extract-nxp-crespo4g.sh $(DOWNLOAD_PATH)/extract-samsung-crespo4g.sh
.PHONY: blobs-nexuss
-blobs-nexuss: $(DOWNLOAD_PATH)/extract-broadcom-crespo.sh $(DOWNLOAD_PATH)/extract-imgtec-crespo.sh $(DOWNLOAD_PATH)/extract-nxp-crespo.sh $(DOWNLOAD_PATH)/extract-samsung-crespo.sh
+blobs-nexuss: $(DOWNLOAD_PATH)/extract-akm-crespo.sh $(DOWNLOAD_PATH)/extract-broadcom-crespo.sh $(DOWNLOAD_PATH)/extract-imgtec-crespo.sh $(DOWNLOAD_PATH)/extract-nxp-crespo.sh $(DOWNLOAD_PATH)/extract-samsung-crespo.sh
mkdir -p $(GONK_PATH)/packages/wallpapers/LivePicker
touch $(GONK_PATH)/packages/wallpapers/LivePicker/android.software.live_wallpaper.xml
2 gaia
@@ -1 +1 @@
-Subproject commit f6288b38c2ddd719f022d3710cbd080493050528
+Subproject commit 44d9d77a98a23b107fa83960addbcbbdee5a8171
2 gecko
@@ -1 +1 @@
-Subproject commit df0ff9bcf0d66220648d8db4fdd3b31599f7bdf4
+Subproject commit c5cec47b7e55b23d6406c7bad56f77cb19974cdd
2 glue/gonk/device/samsung/crespo
@@ -1 +1 @@
-Subproject commit 2f5b811ee69e05f6a3a2fa4b18cd3e9d29bf2dcc
+Subproject commit 5d498d0898c22a8292ff70a2a37184322fbd03a0

0 comments on commit 6e945ce

Please sign in to comment.
Something went wrong with that request. Please try again.