p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Support build targets with no installable apps/packages"

This commit is contained in:
Gaurav Shah 2015-11-02 22:22:40 +00:00 committed by Gerrit Code Review
parent a80f1e3257 67c2ed390f
commit aed6805380
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/Makefile
View File

@ -320,7 +320,12 @@ $(PACKAGE_STATS_FILE): $(PACKAGES_TO_STAT)
@echo Package stats: $@ @echo Package stats: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@ $(hide) rm -f $@
ifeq ($(PACKAGES_TO_STAT),)
# Create empty package stats file if target builds no jar(s) or apk(s).
$(hide) touch $@
else
$(hide) build/tools/dump-package-stats $^ > $@ $(hide) build/tools/dump-package-stats $^ > $@
endif
.PHONY: package-stats .PHONY: package-stats
package-stats: $(PACKAGE_STATS_FILE) package-stats: $(PACKAGE_STATS_FILE)
@ -1742,8 +1747,13 @@ $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE)
@echo "Package apps: $@" @echo "Package apps: $@"
$(hide) rm -rf $@ $(hide) rm -rf $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) zip -qj $@ $(TARGET_OUT_APPS)/*/*.apk $(TARGET_OUT_APPS_PRIVILEGED)/*/*.apk $(hide) apps_to_zip=`find $(TARGET_OUT_APPS) $(TARGET_OUT_APPS_PRIVILEGED) -mindepth 2 -maxdepth 3 -name "*.apk"`; \
if [ -z "$$apps_to_zip" ]; then \
echo "No apps to zip up. Generating empty apps archive." ; \
a=$$(mktemp /tmp/XXXXXXX) && touch $$a && zip $@ $$a && zip -d $@ $$a; \
else \
zip -qj $@ $$apps_to_zip; \
fi
#------------------------------------------------------------------ #------------------------------------------------------------------
# A zip of emma code coverage meta files. Generated for fully emma # A zip of emma code coverage meta files. Generated for fully emma