Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33360dd5 authored by Ying Wang's avatar Ying Wang
Browse files

Running jarjar on Java resources. 

Before this change, Java resources are added as a separate step
(add-java-resources-to-package) after dex is run, so jarjar isn't run on
the resource files.
With this change, we add Java resources immediately after we call javac,
so jarjar is run on the resource files (the module's own resource, as
well as resources carried by static Java libraries).
When we generate the final apk/jar, we use the jarjar'ed jar as the
inital pacakge file, with class files and empty folders removed.

When jack is enabled, in jack-java-to-dex we add the Java resources to
a temp jar using the PRIVATE_EXTRA_JAR_ARGS, and extrac the files in a
temp dir. Jack will process the resource files and output the result to
PRIVATE_JACK_INTERMEDIATES_DIR. When we package the final apk/jar, we
need to call add-carried-jack-resources to readd the resources.
(TODO: if jack can output all resources to a jar/zip file, we can use
that file as the initial package file as well.)

Bug: 18837479
Change-Id: I8d7296e30ec8d005054cf04c4f2aed6d7a0d823b
parent 350c662a

core/base_rules.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -409,7 +409,6 @@ endif # TARGET_ 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)





# full_java_libs: The list of files that should be used as the classpath.

# full_java_libs: The list of files that should be used as the classpath.

#                 Using this list as a dependency list WILL NOT WORK.

#                 Using this list as a dependency list WILL NOT WORK.
@@ -682,7 +681,7 @@ endif 
###########################################################

###########################################################

# JACK

# JACK

###########################################################

###########################################################

ifeq ($(strip $(LOCAL_USE_JACK)),true)

ifeq ($(LOCAL_USE_JACK),true)

ifdef need_compile_java

ifdef need_compile_java





full_static_jack_libs := \

full_static_jack_libs := \

core/definitions.mk

+19 −21
Original line number Original line Diff line number Diff line
@@ -1702,6 +1702,7 @@ $(if $(PRIVATE_JAR_MANIFEST), \ 
        jar -cfm $@ $(dir $@)/manifest.mf \

        jar -cfm $@ $(dir $@)/manifest.mf \

            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \

            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \

    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))

endef

endef





define transform-java-to-classes.jar

define transform-java-to-classes.jar
@@ -1733,6 +1734,12 @@ $(if $(PRIVATE_JACK_PROGUARD_FLAGS), \ 
    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

)

)

$(if $(PRIVATE_EXTRA_JAR_ARGS),

    $(hide) mkdir -p $@.res.tmp

    $(hide) $(call create-empty-package-at,$@.res.tmp.zip)

    $(hide) $(call add-java-resources-to,$@.res.tmp.zip)

    $(hide) $(call unzip-jar-files,$@.res.tmp.zip,$@.res.tmp)

    $(hide) rm $@.res.tmp.zip)

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \

else \

else \
@@ -1746,6 +1753,7 @@ $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA 
    $(addprefix --classpath ,$(strip \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    $(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \

    -D jack.import.resource.policy=keep-first \

    -D jack.import.resource.policy=keep-first \

    -D jack.import.type.policy=keep-first \

    -D jack.import.type.policy=keep-first \

    --output-jack $(PRIVATE_CLASSES_JACK) \

    --output-jack $(PRIVATE_CLASSES_JACK) \
@@ -1757,6 +1765,7 @@ $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA 
    || ( rm -rf $(PRIVATE_CLASSES_JACK); rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR); exit 41 )

    || ( rm -rf $(PRIVATE_CLASSES_JACK); rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR); exit 41 )

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/classes*.dex $(dir $@)

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/classes*.dex $(dir $@)

$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list

$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp)

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq $(PRIVATE_JACK_INTERMEDIATES_DIR).java-source-list

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq $(PRIVATE_JACK_INTERMEDIATES_DIR).java-source-list

$(if $(PRIVATE_JAR_PACKAGES), $(hide) echo unsupported options PRIVATE_JAR_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_PACKAGES), $(hide) echo unsupported options PRIVATE_JAR_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) echo unsupported options JAR_EXCLUDE_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) echo unsupported options JAR_EXCLUDE_PACKAGES in $@; exit 53)
@@ -1890,6 +1899,7 @@ $(if $(PRIVATE_JAR_MANIFEST), \ 
        jar -cfm $@ $(dir $@)/manifest.mf \

        jar -cfm $@ $(dir $@)/manifest.mf \

            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \

            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \

    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))

$(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp

$(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp

endef

endef
@@ -1945,6 +1955,15 @@ define create-empty-package 
$(call create-empty-package-at,$@)

$(call create-empty-package-at,$@)

endef

endef





# Copy an arhchive file and delete any class files and empty folders inside.

# $(1): the source archive file.

# $(2): the destination archive file.

define initialize-package-file

@mkdir -p $(dir $(2))

$(hide) cp -f $(1) $(2)

$(hide) zip -qd $(2) "*.class" "*/" || true # Ignore the error when nothing to delete.

endef



#TODO: we kinda want to build different asset packages for

#TODO: we kinda want to build different asset packages for

#      different configurations, then combine them later (or something).

#      different configurations, then combine them later (or something).

#      Per-locale, etc.

#      Per-locale, etc.
@@ -2004,25 +2023,6 @@ $(hide) jar uf $(1) @$(1).jar-arg-list 
@rm -f $(1).jar-arg-list

@rm -f $(1).jar-arg-list

endef

endef





# Add java resources added by the current module.

#

define add-java-resources-to-package

$(call add-java-resources-to,$@)

endef



# Add java resources carried by static Java libraries.

#

define add-carried-java-resources

$(hide) if [ -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) ] ; then \

    java_res_jar_flags=$$(find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -type f -a -not -name "*.class" \

        | sed -e "s?^$(PRIVATE_CLASS_INTERMEDIATES_DIR)/? -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ?"); \

    if [ -n "$$java_res_jar_flags" ] ; then \

        echo $$java_res_jar_flags >$(dir $@)java_res_jar_flags; \

        jar uf $@ $$java_res_jar_flags; \

    fi; \

fi

endef



# Add resources carried by static Jack libraries.

# Add resources carried by static Jack libraries.

#

#

define add-carried-jack-resources

define add-carried-jack-resources
@@ -2036,7 +2036,6 @@ define add-carried-jack-resources 
fi

fi

endef

endef







# Sign a package using the specified key/cert.

# Sign a package using the specified key/cert.

#

#

define sign-package

define sign-package
@@ -2078,7 +2077,6 @@ endef 
define transform-host-java-to-package

define transform-host-java-to-package

@echo "host Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

@echo "host Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

$(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH))

$(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH))

$(if $(PRIVATE_EXTRA_JAR_ARGS), $(call add-java-resources-to-package))

endef

endef





###########################################################

###########################################################

core/dpi_specific_apk.mk

+13 −10
Original line number Original line Diff line number Diff line
@@ -25,34 +25,37 @@ $(built_dpi_apk): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME 
$(built_dpi_apk): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_INSTRUMENTATION_FOR)

$(built_dpi_apk): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_INSTRUMENTATION_FOR)

$(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)

$(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)

$(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)

$(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)

$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex)

# Note that PRIVATE_CLASS_INTERMEDIATES_DIR points to the base apk's intermediate dir.

$(built_dpi_apk): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes

$(built_dpi_apk): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)

$(built_dpi_apk): PRIVATE_PRIVATE_KEY := $(private_key)

$(built_dpi_apk): PRIVATE_PRIVATE_KEY := $(private_key)

$(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate)

$(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate)

$(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\

$(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\

    $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)

    $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)





ifneq ($(full_classes_jar),)

$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex)

# Use the jarjar processed arhive as the initial package file.

$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar)

$(built_dpi_apk): $(built_dex)

else

$(built_dpi_apk): PRIVATE_DEX_FILE :=

$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE :=

endif # full_classes_jar



# Set up dependenncies and the build recipe.

# Set up dependenncies and the build recipe.

$(built_dpi_apk) : $(R_file_stamp)

$(built_dpi_apk) : $(R_file_stamp)

$(built_dpi_apk) : $(all_library_res_package_export_deps)

$(built_dpi_apk) : $(all_library_res_package_export_deps)

$(built_dpi_apk) : $(built_dex)

$(built_dpi_apk) : $(private_key) $(certificate) $(SIGNAPK_JAR)

$(built_dpi_apk) : $(private_key) $(certificate) $(SIGNAPK_JAR)

$(built_dpi_apk) : $(AAPT) | $(ZIPALIGN)

$(built_dpi_apk) : $(AAPT) | $(ZIPALIGN)

$(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)

$(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)

	@echo "target Package: $(PRIVATE_MODULE) ($@)"

	@echo "target Package: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)

	$(if $(PRIVATE_SOURCE_ARCHIVE),\

	  $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\

	  $(create-empty-package))

	$(add-assets-to-package)

	$(add-assets-to-package)

ifneq ($(jni_shared_libraries),)

ifneq ($(jni_shared_libraries),)

	$(add-jni-shared-libs-to-package)

	$(add-jni-shared-libs-to-package)

endif

endif

ifneq ($(full_classes_jar),)

ifneq ($(full_classes_jar),)

	$(add-dex-to-package)

	$(add-dex-to-package)

endif

	$(add-carried-java-resources)

ifneq ($(extra_jar_args),)

	$(add-java-resources-to-package)

endif

endif

	$(sign-package)

	$(sign-package)

	$(align-package)

	$(align-package)

core/host_dalvik_java_library.mk

+3 −9
Original line number Original line Diff line number Diff line
@@ -97,21 +97,18 @@ $(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP) 
	@echo Copying: $@

	@echo Copying: $@

	$(hide) $(ACP) -fp $< $@

	$(hide) $(ACP) -fp $< $@





ifneq ($(strip $(LOCAL_USE_JACK)),true)

ifneq ($(LOCAL_USE_JACK),true)

$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)

$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)

$(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)

$(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)

$(built_dex): $(full_classes_jar) $(DX)

$(built_dex): $(full_classes_jar) $(DX)

	$(transform-classes.jar-to-dex)

	$(transform-classes.jar-to-dex)





$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)

$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)

$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar)

$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)

$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)

	@echo "Host Jar: $(PRIVATE_MODULE) ($@)"

	@echo "Host Jar: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)

	$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)

	$(add-dex-to-package)

	$(add-dex-to-package)

	$(add-carried-java-resources)

ifneq ($(extra_jar_args),)

	$(add-java-resources-to-package)

endif





else # LOCAL_USE_JACK

else # LOCAL_USE_JACK

$(LOCAL_INTERMEDIATE_TARGETS): \

$(LOCAL_INTERMEDIATE_TARGETS): \
@@ -134,9 +131,6 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) 
	$(create-empty-package)

	$(create-empty-package)

	$(add-dex-to-package)

	$(add-dex-to-package)

	$(add-carried-jack-resources)

	$(add-carried-jack-resources)

ifneq ($(extra_jar_args),)

	$(add-java-resources-to-package)

endif





endif # LOCAL_USE_JACK

endif # LOCAL_USE_JACK

core/java.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -471,7 +471,7 @@ legacy_proguard_flags := -injars $(link_instr_classes_jar) \ 
    -verbose \

    -verbose \

    $(legacy_proguard_flags)

    $(legacy_proguard_flags)

# not supported with jack

# not supported with jack

ifeq ($(strip $(LOCAL_USE_JACK)),true)

ifeq ($(LOCAL_USE_JACK),true)

    $(error $(LOCAL_MODULE): Build with jack of instrumentation when obfuscating is not yet supported)

    $(error $(LOCAL_MODULE): Build with jack of instrumentation when obfuscating is not yet supported)

endif

endif
@@ -562,7 +562,7 @@ $(LOCAL_MODULE)-findbugs : $(findbugs_html) 




endif  # full_classes_jar is defined

endif  # full_classes_jar is defined





ifeq ($(strip $(LOCAL_USE_JACK)),true)

ifeq ($(LOCAL_USE_JACK),true)

$(LOCAL_INTERMEDIATE_TARGETS): \

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack

	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack