Merge "Add make sync target" am: 564ce0fa53

am: 5d848ba50a

Change-Id: I384460e7373aec904a4779d8af1648f20c004ff8
This commit is contained in:
Colin Cross 2017-06-21 03:00:47 +00:00 committed by android-build-merger
commit 38e8c8bc8c

View file

@ -1314,7 +1314,6 @@ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
$(PDK_FUSION_SYSIMG_FILES) \ $(PDK_FUSION_SYSIMG_FILES) \
$(RECOVERY_RESOURCE_ZIP)) $(RECOVERY_RESOURCE_ZIP))
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS) FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
# ASAN libraries in the system image - add dependency. # ASAN libraries in the system image - add dependency.
@ -1436,6 +1435,9 @@ $(warning Warning: with dexpreopt enabled, you may need a full rebuild.)
endif endif
endif endif
.PHONY: sync
sync: $(INTERNAL_SYSTEMIMAGE_FILES)
####### #######
## system tarball ## system tarball
define build-systemtarball-target define build-systemtarball-target
@ -1818,6 +1820,8 @@ $(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIM
vendorimage-nodeps vnod: | $(INTERNAL_USERIMAGES_DEPS) $(DEPMOD) vendorimage-nodeps vnod: | $(INTERNAL_USERIMAGES_DEPS) $(DEPMOD)
$(build-vendorimage-target) $(build-vendorimage-target)
sync: $(INTERNAL_VENDORIMAGE_FILES)
else ifdef BOARD_PREBUILT_VENDORIMAGE else ifdef BOARD_PREBUILT_VENDORIMAGE
INSTALLED_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img INSTALLED_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img
$(eval $(call copy-one-file,$(BOARD_PREBUILT_VENDORIMAGE),$(INSTALLED_VENDORIMAGE_TARGET))) $(eval $(call copy-one-file,$(BOARD_PREBUILT_VENDORIMAGE),$(INSTALLED_VENDORIMAGE_TARGET)))