Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ff8970 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Allow GSI targets to build otatools.zip 

otatools.zip is required to sign GSI.

Bug: 112293933
Test: lunch aosp_arm64-userdebug && make otatools-package
Test: lunch aosp_arm64-userdebug && make otapackage will fail
Change-Id: Iae9f9af5cc8b98c05a66219779ce35592d3321bd
parent 3f722398

core/Makefile

+34 −25
Original line number Diff line number Diff line
@@ -3045,13 +3045,15 @@ endif 
# -----------------------------------------------------------------

# 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

  ifeq ($(TARGET_SKIP_OTA_PACKAGE),true)

    build_ota_package := false

  endif

ifeq ($(BUILD_OS),darwin)

build_ota_package := false

endif

  ifneq ($(strip $(SANITIZE_TARGET)),)

    build_ota_package := false

  endif
@@ -3071,7 +3073,14 @@ ifeq ($(TARGET_BUILD_PDK),true) 
    build_ota_package := false

  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 \

  $(HOST_OUT_EXECUTABLES)/aapt \

  $(HOST_OUT_EXECUTABLES)/checkvintf \
@@ -3189,7 +3198,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS) 
.PHONY: 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.