StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
This commit is contained in:
Ying Wang
2011-03-09 17:02:35 -08:00
parent 122b3d196b 123995f9e1
commit f8a7ff191a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/main.mk
View File

@@ -832,7 +832,8 @@ ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
$(call dist-for-goals,sdk win_sdk, \ $(call dist-for-goals,sdk win_sdk, \
$(ALL_SDK_TARGETS) \ $(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \ $(SYMBOLS_ZIP) \
) $(INSTALLED_BUILD_PROP_TARGET) \
)
endif endif
.PHONY: samplecode .PHONY: samplecode