Merge "Recompress android.jar before packaging it." am: 104232e0fc
am: 9fc8db483a
Change-Id: Ifadd18770d7b44246c4dfa1f497f171ff646a126
This commit is contained in:
@@ -68,7 +68,16 @@ android_jar_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/androi
|
|||||||
android_jar_full_target := $(android_jar_intermediates)/android.jar
|
android_jar_full_target := $(android_jar_intermediates)/android.jar
|
||||||
android_jar_src_target := $(android_jar_intermediates)/android-stubs-src.jar
|
android_jar_src_target := $(android_jar_intermediates)/android-stubs-src.jar
|
||||||
|
|
||||||
$(android_jar_full_target): $(full_target)
|
# unzip and zip android.jar before packaging it. (workaround for b/127733650)
|
||||||
|
full_target_repackaged := $(android_jar_intermediates)/repackaged/repackaged.jar
|
||||||
|
$(full_target_repackaged): $(full_target) | $(ZIPTIME)
|
||||||
|
@echo Repackaging SDK jar: $@
|
||||||
|
$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
|
||||||
|
unzip -q $< -d $(dir $@)
|
||||||
|
cd $(dir $@) && zip -rqX $(notdir $@) *
|
||||||
|
$(remove-timestamps-from-package)
|
||||||
|
|
||||||
|
$(android_jar_full_target): $(full_target_repackaged)
|
||||||
@echo Package SDK Stubs: $@
|
@echo Package SDK Stubs: $@
|
||||||
$(copy-file-to-target)
|
$(copy-file-to-target)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user