tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow GSI targets to build otatools.zip"

Browse source 
am: 07d87198ee

Change-Id: Ie2732eccba803709d7f34ccaf1fd287f90d2cc8a
This commit is contained in:
Bowgo Tsai 2018-10-12 07:45:49 -07:00 committed by android-build-merger
commit ad0114acb1
1 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/Makefile
View file

@ -3045,13 +3045,15 @@ endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# host tools needed to build dist and OTA packages # host tools needed to build dist and OTA packages
ifeq ($(BUILD_OS),darwin)
build_ota_package := false
build_otatools_package := false
else
# set build_ota_package, and allow opt-out below
build_ota_package := true build_ota_package := true
ifeq ($(TARGET_SKIP_OTA_PACKAGE),true) ifeq ($(TARGET_SKIP_OTA_PACKAGE),true)
build_ota_package := false build_ota_package := false
endif endif
ifeq ($(BUILD_OS),darwin)
build_ota_package := false
endif
ifneq ($(strip $(SANITIZE_TARGET)),) ifneq ($(strip $(SANITIZE_TARGET)),)
build_ota_package := false build_ota_package := false
endif endif
@ -3071,7 +3073,14 @@ ifeq ($(TARGET_BUILD_PDK),true)
build_ota_package := false build_ota_package := false
endif endif
ifeq ($(build_ota_package),true) # set build_otatools_package, and allow opt-out below
build_otatools_package := true
ifeq ($(TARGET_SKIP_OTATOOLS_PACKAGE),true)
build_otatools_package := false
endif
endif
ifeq ($(build_otatools_package),true)
OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/aapt \ $(HOST_OUT_EXECUTABLES)/aapt \
$(HOST_OUT_EXECUTABLES)/checkvintf \ $(HOST_OUT_EXECUTABLES)/checkvintf \
@ -3189,7 +3198,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS)
.PHONY: otatools-package .PHONY: otatools-package
otatools-package: $(BUILT_OTATOOLS_PACKAGE) otatools-package: $(BUILT_OTATOOLS_PACKAGE)
endif # build_ota_package endif # build_otatools_package
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# A zip of the directories that map to the target filesystem. # A zip of the directories that map to the target filesystem.