Merge "Factor out common code."

  # If we have stripped the final APK, use the original jar generated by soong.

  $(built_odex): $(LOCAL_SOONG_DEX_JAR)

	$(call dexpreopt-one-file,$<,$@)

  $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))

else

  # If we haven't stripped, use the final APK for dexpreopt, as this may affect how the dex

  # code is compiled.

  $(built_odex): $(LOCAL_PREBUILT_MODULE_FILE)

	$(call dexpreopt-one-file,$<,$@)

  $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))

endif  # LOCAL_STRIP_DEX

  $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))

else

  $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

endif