Skip to content

Commit

Permalink
fix the issue that framework-miui-res.apk is push to app
Browse files Browse the repository at this point in the history
Change-Id: I0ddc821696110554e7a2b5f61150cd173223dad7
  • Loading branch information
fanoge committed Jan 19, 2012
1 parent 4a040f0 commit 01ab49c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions porting.mk
Expand Up @@ -139,17 +139,21 @@ $(foreach app, $(MIUIAPPS_MOD), \
$(eval $(call APP_template,$(app),$(app),$(TMP_DIR)/$(app))))
$(eval $(call APP_template,MIUISystemUI,SystemUI,$(TMP_DIR)/SystemUI))

$(foreach app, $(APPS) $(MIUIAPPS_MOD), \
MIUIAPPS_MOD_NO_RESAPK = $(filter-out framework-miui-res,$(MIUIAPPS_MOD))
$(foreach app, $(APPS) $(MIUIAPPS_MOD_NO_RESAPK), \
$(eval $(call SIGN_template,$(TMP_DIR)/$(app).apk,/system/app/$(app).apk)))
$(foreach app, $(MIUIAPPS), \
$(eval $(call SIGN_template,$(OUT_APK_PATH)/$(app).apk,/system/app/$(app).apk)))
ifeq ($(findstring framework-miui-res,$(MIUIAPPS_MOD)),)
$(eval $(call SIGN_template,$(OUT_JAR_PATH)/framework-miui-res.apk,/system/framework/framework-miui-res.apk))
else
$(eval $(call SIGN_template,$(TMP_DIR)/framework-miui-res.apk,/system/framework/framework-miui-res.apk))
endif

$(eval $(call SIGN_template,$(TMP_DIR)/framework-res.apk,/system/framework/framework-res.apk))
$(eval $(call SIGN_template,$(TMP_DIR)/MIUISystemUI.apk,/system/app/SystemUI.apk))

$(foreach app, $(MIUIAPPS) $(MIUIAPPS_MOD) MIUISystemUI, $(eval $(call BUILD_CLEAN_APP_template,$(app))))
$(foreach app, $(MIUIAPPS) $(MIUIAPPS_MOD_NO_RESAPK) MIUISystemUI, $(eval $(call BUILD_CLEAN_APP_template,$(app))))


# for release
Expand Down
2 changes: 2 additions & 0 deletions util.mk
Expand Up @@ -85,6 +85,8 @@ verify: $(ERR_REPORT)
@echo "ACT_PRE_ZIP = $(ACT_AFTER_ZIP)"
@echo "USE_ANDROID_OUT = $(USE_ANDROID_OUT)"
@echo "RELEASE_MIUI = $(RELEASE_MIUI)"
@echo "MIUIAPPS_MOD = $(MIUIAPPS_MOD)"
@echo "MIUIAPPS_MOD_NO_RESAPK = $(MIUIAPPS_MOD_NO_RESAPK)"
@echo "----------------------"
@echo ">>>>> MORE VARIABLE:"
@echo "SIGNAPKS = $(SIGNAPKS)"
Expand Down

0 comments on commit 01ab49c

Please sign in to comment.