Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

support local-miui-modified-apps

Change-Id: Ide2fe3f0ee50e128494b737a29b1118751da6220
  • Loading branch information...
commit 222c302951be5621b5c1b38967521b18dc10744b 1 parent 92c85c6
@fanoge fanoge authored
Showing with 13 additions and 5 deletions.
  1. +2 −3 localvar.mk
  2. +11 −2 porting.mk
View
5 localvar.mk
@@ -5,6 +5,7 @@
# local-out-zip-file
# local-modified-apps
# local-miui-apps
+# local-miui-modified-apps
# local-remove-apps
# local-pre-zip
# local-after-zip
@@ -25,6 +26,7 @@ endif
APPS := $(strip $(local-modified-apps))
MIUIAPPS := $(strip $(local-miui-apps))
+MIUIAPPS_MOD := $(strip $(local-miui-modified-apps))
ACT_PRE_ZIP := pre-zip-misc
ACT_PRE_ZIP += $(strip $(local-pre-zip))
@@ -36,9 +38,6 @@ endif
ACT_AFTER_ZIP := $(strip $(local-after-zip))
-#
-#USE_ANDROID_OUT := $(strip $(local-use-android-out))
-
ifeq ($(strip $(USE_ANDROID_OUT)),true)
ifeq ($(ANDROID_OUT),)
ERR_REPORT += error-android-env
View
13 porting.mk
@@ -77,8 +77,13 @@ $(TMP_DIR)/$(1).apk: $(3) $(TMP_DIR)
cp -r $(2) $(TMP_DIR)
$(APKTOOL) b $(TMP_DIR)/$(2) $$@
+ifeq ($(1),framework-miui-res)
+$(3): $(OUT_JAR_PATH)/$(1).apk
+ $(APKTOOL) d -f $(OUT_JAR_PATH)/$(1).apk $(3)
+else
$(3): $(OUT_APK_PATH)/$(1).apk
$(APKTOOL) d -f $(OUT_APK_PATH)/$(1).apk $(3)
+endif
endef
@@ -130,17 +135,21 @@ $(foreach jar, $(JARS), \
$(foreach app, $(APPS) framework-res, \
$(eval $(call APP_template,$(app),$(app))))
+$(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), \
+$(foreach app, $(APPS) $(MIUIAPPS_MOD), \
$(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))
+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) MIUISystemUI, $(eval $(call BUILD_CLEAN_APP_template,$(app))))
+$(foreach app, $(MIUIAPPS) $(MIUIAPPS_MOD) MIUISystemUI, $(eval $(call BUILD_CLEAN_APP_template,$(app))))
# for release
Please sign in to comment.
Something went wrong with that request. Please try again.