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

Commit 65c91ff1 authored by Inseob Kim's avatar Inseob Kim
Browse files

Fix and generate vndk snapshot entirely in Soong 

- VNDK snapshot now respects stem and suffix.
- ld.config.txt is removed from snapshot as linkerconfig has become default.
- Soong builds entire snapshot, and make just calls dist-for-goals.

Bug: 142589718
Test: build and install snapshot
Test: development/vndk/snapshot/update.py with past version of snapshot
Change-Id: Ib99f1006d3553b1871b86ab168b1706fe47e1afb
parent 047f2fd4

core/tasks/vndk.mk

+2 −80
Original line number Diff line number Diff line
@@ -23,88 +23,10 @@ ifneq (,$(PLATFORM_VNDK_VERSION)) 
# BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'.

ifneq ($(BOARD_VNDK_RUNTIME_DISABLE),true)



# Returns list of src:dest paths of the intermediate objs

#

# Args:

#   $(1): list of module and filename pairs (e.g., ld.config.txt:ld.config.27.txt ...)

define paths-of-intermediates

$(strip \

  $(foreach pair,$(1), \

    $(eval module := $(call word-colon,1,$(pair))) \

    $(eval built := $(ALL_MODULES.$(module).BUILT_INSTALLED)) \

    $(eval filename := $(call word-colon,2,$(pair))) \

    $(if $(wordlist 2,100,$(built)), \

      $(error Unable to handle multiple built files ($(module)): $(built))) \

    $(if $(built),$(call word-colon,1,$(built)):$(filename)) \

  ) \

)

endef



vndk_prebuilt_txts := \

  ld.config.txt \

  vndksp.libraries.txt \

  llndk.libraries.txt



vndk_snapshot_top := $(call intermediates-dir-for,PACKAGING,vndk-snapshot)

vndk_snapshot_out := $(vndk_snapshot_top)/vndk-snapshot

vndk_snapshot_soong_dir := $(call intermediates-dir-for,PACKAGING,vndk-snapshot-soong)



#######################################

# vndk_snapshot_zip

vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH)

vndk_snapshot_zip := $(PRODUCT_OUT)/android-vndk-$(TARGET_PRODUCT).zip



$(vndk_snapshot_zip): PRIVATE_VNDK_SNAPSHOT_OUT := $(vndk_snapshot_out)



deps := $(call paths-of-intermediates,$(foreach txt,$(vndk_prebuilt_txts), \

          $(txt):$(patsubst %.txt,%.$(PLATFORM_VNDK_VERSION).txt,$(txt))))

$(vndk_snapshot_zip): PRIVATE_CONFIGS_OUT := $(vndk_snapshot_variant)/configs

$(vndk_snapshot_zip): PRIVATE_CONFIGS_INTERMEDIATES := $(deps)

$(vndk_snapshot_zip): $(foreach d,$(deps),$(call word-colon,1,$(d)))

deps :=



vndk_snapshot_soong_files := $(call copy-many-files, $(SOONG_VNDK_SNAPSHOT_FILES), $(vndk_snapshot_soong_dir))



$(vndk_snapshot_zip): PRIVATE_VNDK_SNAPSHOT_SOONG_DIR := $(vndk_snapshot_soong_dir)

$(vndk_snapshot_zip): PRIVATE_VNDK_SNAPSHOT_SOONG_FILES := $(sort $(vndk_snapshot_soong_files))

$(vndk_snapshot_zip): $(vndk_snapshot_soong_files)



# Args

#   $(1): destination directory

#   $(2): list of files (src:dest) to copy

$(vndk_snapshot_zip): private-copy-intermediates = \

  $(if $(2),$(strip \

    @mkdir -p $(1) && \

    $(foreach file,$(2), \

      cp $(call word-colon,1,$(file)) $(call append-path,$(1),$(call word-colon,2,$(file))) && \

    ) \

    true \

  ))



$(vndk_snapshot_zip): $(SOONG_ZIP)

	@echo 'Generating VNDK snapshot: $@'

	@rm -f $@

	@rm -rf $(PRIVATE_VNDK_SNAPSHOT_OUT)

	@mkdir -p $(PRIVATE_VNDK_SNAPSHOT_OUT)

	$(call private-copy-intermediates, \

		$(PRIVATE_CONFIGS_OUT),$(PRIVATE_CONFIGS_INTERMEDIATES))

	$(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_VNDK_SNAPSHOT_OUT) -D $(PRIVATE_VNDK_SNAPSHOT_OUT) \

		-C $(PRIVATE_VNDK_SNAPSHOT_SOONG_DIR) $(foreach f,$(PRIVATE_VNDK_SNAPSHOT_SOONG_FILES),-f $(f))



.PHONY: vndk

vndk: $(vndk_snapshot_zip)



$(call dist-for-goals, vndk, $(vndk_snapshot_zip))

vndk: $(SOONG_VNDK_SNAPSHOT_ZIP)



# clear global vars

clang-ubsan-vndk-core :=

paths-of-intermediates :=

vndk_prebuilt_txts :=

vndk_snapshot_top :=

vndk_snapshot_out :=

vndk_snapshot_soong_dir :=

vndk_snapshot_soong_files :=

vndk_snapshot_variant :=

$(call dist-for-goals, vndk, $(SOONG_VNDK_SNAPSHOT_ZIP))



else # BOARD_VNDK_RUNTIME_DISABLE is set to 'true'

error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'."