Skip to content

Commit

Permalink
Merge branch 'master' into oprofile_update_01
Browse files Browse the repository at this point in the history
  • Loading branch information
changyihsin committed Mar 7, 2012
2 parents c974d26 + d7ed2e8 commit 6e945ce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Makefile
Expand Up @@ -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 $(DOWNLOAD_PATH)/extract-samsung-crespo4g.sh: $(DOWNLOAD_PATH)/samsung-crespo4g-$(NEXUS_S_BUILD)-9474e48f.tgz
cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@ 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 $(DOWNLOAD_PATH)/extract-broadcom-crespo.sh: $(DOWNLOAD_PATH)/broadcom-crespo-$(NEXUS_S_BUILD)-fb8eed0c.tgz
cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@ cd $(DOWNLOAD_PATH) && tar zxvf $< && cd $(GONK_PATH) && $@


Expand All @@ -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 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 .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 mkdir -p $(GONK_PATH)/packages/wallpapers/LivePicker
touch $(GONK_PATH)/packages/wallpapers/LivePicker/android.software.live_wallpaper.xml touch $(GONK_PATH)/packages/wallpapers/LivePicker/android.software.live_wallpaper.xml


Expand Down
2 changes: 1 addition & 1 deletion gaia
Submodule gaia updated 119 files
2 changes: 1 addition & 1 deletion gecko
Submodule gecko updated from df0ff9 to c5cec4
2 changes: 1 addition & 1 deletion glue/gonk/device/samsung/crespo
Submodule crespo updated from 2f5b81 to 5d498d

0 comments on commit 6e945ce

Please sign in to comment.