am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.
This commit is contained in:
Ying Wang 2011-03-09 17:05:10 -08:00 committed by Android Git Automerger
commit eb6e294feb
1 changed files with 4 additions and 3 deletions

View File

@ -830,9 +830,10 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
sdk: $(ALL_SDK_TARGETS)
ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
$(call dist-for-goals,sdk win_sdk, \
$(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \
)
$(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \
$(INSTALLED_BUILD_PROP_TARGET) \
)
endif
.PHONY: samplecode